Merge remote-tracking branch 'origin/nb/css'

Conflicts:
	client/components/App.js
	static/app.js
	static/index.css

client/components/FileDescription.js

@@ -5,8 +5,6 @@ export default class FileDescription extends React.Component {
   render() {
     return <div className="file-description">
       <span className="file-name">{this.props.file.name}</span>
-      <span className="file-size">{this.props.file.size}</span>
-      <span className="file-type">{this.props.file.type}</span>
     </div>;
   }
 

client/components/Header.js

@@ -0,0 +1,12 @@
+import React from 'react';
+
+export default class Header extends React.Component {
+
+  render() {
+    return <div className="header">
+      <div className="header-title">WebDrop</div>
+      <div className="header-subtitle">Send Files, Easily.</div>
+    </div>
+  }
+
+}