Merge branch 'master' into search_page

twistter-frontend/src/App.js

@@ -62,20 +62,24 @@ class App extends Component {
             <div className="container">
               <Navbar />
             </div>
-
             <div className="app">
               <Switch>
+
                 {/* AuthRoute checks if the user is logged in and if they are it redirects them to /home */}
                 <AuthRoute exact path="/signup" component={signup} />
                 <AuthRoute exact path="/login" component={login} />
+                <AuthRoute exact path="/" component={home}/>
+
                 <Route exact path="/logout" component={logout} />
                 <Route exact path="/delete" component={Delete} />
+
+                <Route exact path="/home" component={home} />
                 <Route exact path="/user" component={user} />
-                <Route exact path="/home" component={writeMicroblog} />
                 <Route exact path="/edit" component={editProfile} />
                 <Route exact path="/search" component={Search} />
 
                 <AuthRoute exact path="/" component={home} />
+
               </Switch>
             </div>
           </Router>