diff -r d076a27e5631 -r 431977d7c9a6 client/src/components/NotesContainer.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/components/NotesContainer.js	Mon May 22 14:34:35 2017 +0200
@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+
+import PropTypes from 'prop-types';
+import Immutable from 'immutable';
+
+import * as notesActions from '../actions/notes-actions';
+import NotesList from './NotesList';
+import NoteInput from './NoteInput';
+
+class NotesContainer extends Component {
+    render() {
+        const { notes } = this.props;
+        return (
+            <div>
+                <NotesList notes={notes} />
+                <NoteInput addNote={this.props.actions.addNote} />
+            </div>
+        );
+    }
+}
+
+NotesContainer.propTypes = {
+    notes: PropTypes.instanceOf(Immutable.List).isRequired,
+    actions: PropTypes.object.isRequired
+}
+
+function mapStateToProps(state, props) {
+  return {
+    notes: state.get('notes')
+  };
+}
+
+function mapDispatchToProps(dispatch) {
+  return {
+    actions: bindActionCreators(notesActions, dispatch)
+  }
+}
+
+
+export default connect(mapStateToProps, mapDispatchToProps)(NotesContainer);
\ No newline at end of file