Changed application.css to application.css.scss (sass)
Merge remote-tracking branch 'origin/master'