<!DOCTYPE html>
<html>
<head>
  <title>StackOverphil</title>
  <%= stylesheet_link_tag    'application', media: 'all' %>
  <%= javascript_include_tag 'application' %>
  <%= csrf_meta_tags %>
</head>
<body>
<h2><%= link_to "stackOverphil", root_path %></h2>
<ul>
<% if logged_in? %>
<<<<<<< Updated upstream
  <li><%= link_to current_user.username, user_path(current_user.id) %> | <%= link_to "logout", logout_path %></li>
=======
  <li><%= link_to current_user.username, user_path(current_user.id) %> | <%= link_to "logout", logout_path %> | <%= link_to 'Ask a question', new_question_path %>
>>>>>>> Stashed changes
<% else %>
  <li><%= link_to "register", register_path %> | <%= link_to "login", login_path %></li>
<% end %>
</ul>
<%= yield %>

</body>
</html>

<!DOCTYPE html>
<html>
<head>
  <title>StackOverphil</title>
  <%= stylesheet_link_tag    'application', media: 'all' %>
  <%= javascript_include_tag 'application' %>
  <%= csrf_meta_tags %>
</head>
<body>
<h2><%= link_to "stackOverphil", root_path %></h2>
<ul>
<% if logged_in? %>
  <li><%= link_to current_user.username, user_path(current_user.id) %> | <%= link_to "logout", logout_path %> | <%= link_to 'Ask a question', new_question_path %> |
<% else %>
  <li><%= link_to "register", register_path %> | <%= link_to "login", login_path %></li>
<% end %>
</ul>
<%= yield %>

</body>
</html>

Add new q link formatted
Add new q link formatted
