Changed stylesheets/application.css.scss and other stuff
Merge branch 'master' of https://github.com/daniesg/college_cake

Conflicts:
	college_cake/app/assets/stylesheets/application.css.scss