Merge backend and frontend repo master branches

Conflicts:
	.gitignore
	.travis.yml
	README.md

1 files changed, 46 insertions, 0 deletions

diff --git a/app/components/Layout.js b/app/components/Layout.js
new file mode 100644
index 0000000000..5c0e1f5bcb
--- /dev/null
+++ b/app/components/Layout.js
@@ -0,0 +1,46 @@
+// @flow
+import React, { Component } from 'react';
+import HeaderBar from './HeaderBar';
+
+import type { HeaderBarProps } from './HeaderBar';
+
+export class Header extends Component {
+  props: HeaderBarProps;
+  static defaultProps = HeaderBar.defaultProps;
+
+  render(): React.Element<*> {
+    return (
+      <div className="layout__header">
+        <HeaderBar { ...this.props } />
+      </div>
+    );
+  }
+}
+
+export class Container extends Component {
+  props: {
+    children: React.Element<*>
+  }
+
+  render(): React.Element<*> {
+    return (
+      <div className="layout__container">
+        { this.props.children }
+      </div>
+    );
+  }
+}
+
+export class Layout extends Component {
+  props: {
+    children: Array<React.Element<*>> | React.Element<*>
+  }
+
+  render(): React.Element<*> {
+    return (
+      <div className="layout">
+        { this.props.children }
+      </div>
+    );
+  }
+}