Working...committing to update
Merge branch 'master' of https://github.com/jimcavoli/College-Reaper

Conflicts:
	app/controllers/schedules_controller.rb