committing changes pre merge
Merge branch 'master' of github.com:daniesg/college_cake

Conflicts:
	college_cake/config/routes.rb