Merged
Merged app/views/devise/menu/_login_items.html.haml
Merged app/views/application/_header.html.haml and app/assets/stylesheets/style.css