6 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/style.css b/app/assets/style.css
new file mode 100644
index 0000000000..5214062738
--- /dev/null
+++ b/app/assets/style.css
@@ -0,0 +1,2 @@
+@import '../components/Login.css';
+@import '../components/LoggedIn.css';
diff --git a/app/components/LoggedIn.css b/app/components/LoggedIn.css
new file mode 100644
index 0000000000..a289e6067d
--- /dev/null
+++ b/app/components/LoggedIn.css
@@ -0,0 +1,3 @@
+.loggedin__container {
+  border: 1px solid black;
+}
+\ No newline at end of file
diff --git a/app/components/LoggedIn.js b/app/components/LoggedIn.js
index 50521d5f6a..c99f289c48 100644
--- a/app/components/LoggedIn.js
+++ b/app/components/LoggedIn.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 export default class LoggedIn extends Component {
   render() {
     return (
-      <div>
+      <div className="loggedin__container">
         <h2>Logged in as {this.props.user.username}</h2>
       </div>
     );
diff --git a/app/components/Login.css b/app/components/Login.css
index b59a5dbc86..362abac556 100644
--- a/app/components/Login.css
+++ b/app/components/Login.css
@@ -1,3 +1,3 @@
-.container {
+.login__container {
   border: 1px solid green;
 }
 \ No newline at end of file
diff --git a/app/components/Login.js b/app/components/Login.js
index d2cea86b42..ec822a4f2b 100644
--- a/app/components/Login.js
+++ b/app/components/Login.js
@@ -1,5 +1,4 @@
 import React, { Component, PropTypes } from 'react';
-import styles from './Login.css';
 
 export default class Login extends Component {
   static propTypes = {
@@ -17,7 +16,7 @@ export default class Login extends Component {
 
   render() {
     return (
-      <div className={styles.container}>
+      <div className="login__container">
         <h2>Login</h2>
         <input ref="username" type="text" />
         <button onClick={::this.handleLogin}>Log In</button>
diff --git a/app/index.html b/app/index.html
index afe6566ca5..684fdc8517 100644
--- a/app/index.html
+++ b/app/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>My App</title>
-    <link rel="stylesheet" href="./assets/stylesheets.css" />
+    <link rel="stylesheet" href="./assets/style.css" />
   </head>
   <body>
     <div id="app"></div>