Displays the user's email in the header if they are signed in. The path to style this is app/views/layouts/_header.html.erb. This commit also fixes a merge conflict that was persisting and screwing up one of the tests.