Adding popup
Merge branch 'master' of https://github.com/daniesg/college_cake

Conflicts:
	college_cake/app/assets/javascripts/home/ajaxer.js
Merge branch 'master' of https://github.com/daniesg/college_cake

Conflicts:
	college_cake/app/assets/javascripts/home.js.erb
	college_cake/app/controllers/college_controller.rb
Added mit.png
Merge branch 'master' of https://github.com/daniesg/college_cake

Conflicts:
	college_cake/app/views/home/index.html.erb