fix conflicts.

resources/views/app.blade.php

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Laravel</title>
 
-    <link href="/css/app.css" rel="stylesheet">
+    <link href="{{ asset('/css/app.css') }}" rel="stylesheet">
 
     <!-- Fonts -->
     <link href='//fonts.googleapis.com/css?family=Roboto:400,300' rel='stylesheet' type='text/css'>
@@ -38,13 +38,13 @@
 
                 <ul class="nav navbar-nav navbar-right">
                     @if (Auth::guest())
-                        <li><a href="/auth/login">Login</a></li>
+                        <li><a href="{{ url('/auth/login') }}">Login</a></li>
-                        <li><a href="/auth/register">Register</a></li>
+                        <li><a href="{{ url('/auth/register') }}">Register</a></li>
                     @else
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ Auth::user()->name }} <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a href="/auth/logout">Logout</a></li>
+                                <li><a href="{{ url('/auth/logout') }}">Logout</a></li>
                             </ul>
                         </li>
                     @endif

resources/views/auth/login.blade.php

@@ -18,7 +18,7 @@
                         </div>
                     @endif
 
-                    <form class="form-horizontal" role="form" method="POST" action="/auth/login">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/auth/login') }}">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
                         <div class="form-group">
@@ -49,6 +49,7 @@
                             <div class="col-md-6 col-md-offset-4">
                                 <button type="submit" class="btn btn-primary">Login</button>
 
+<<<<<<< HEAD
                                 <a class="btn btn-link" href="/password/email">Forgot Your Password?</a>
                             </div>
                         </div>
@@ -57,5 +58,15 @@
             </div>
         </div>
     </div>
+=======
+								<a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+>>>>>>> master
 </div>
 @endsection

resources/views/auth/password.blade.php

@@ -24,7 +24,7 @@
                         </div>
                     @endif
 
-                    <form class="form-horizontal" role="form" method="POST" action="/password/email">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
                         <div class="form-group">

resources/views/auth/register.blade.php

@@ -18,7 +18,7 @@
                         </div>
                     @endif
 
-                    <form class="form-horizontal" role="form" method="POST" action="/auth/register">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/auth/register') }}">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
                         <div class="form-group">

resources/views/auth/reset.blade.php

@@ -18,7 +18,7 @@
                         </div>
                     @endif
 
-                    <form class="form-horizontal" role="form" method="POST" action="/password/reset">
+                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/reset') }}">
                         <input type="hidden" name="_token" value="{{ csrf_token() }}">
                         <input type="hidden" name="token" value="{{ $token }}">