jfa;lsdjfk;ladjsf;adjsfkasjfdl;jakl;sfjdkl;jfak;lsdf
Merge branch 'master' of https://github.com/ilangray/massive-octo-batman

Conflicts:
	app/scripts/controllers/schedule_ctrl.js
	app/views/partials/schedule.html