Add CSS
fixed merge conflicts in application.html.erb
Merge branch 'development' of github.com:alevsxm/Team-Doge into development