Fixed merge differences
Update application.css
Update application.css
Fixing merge conflict
Merge branch 'master' of https://github.com/AlexMorgan/devise_tutorial