updating docs
resolved merge conflicts with controller docs
Updated docs and some other things, I suppose
Updating coverage reports
Fixing little syntax error
Merge branch 'scheduling_models' of https://github.com/eaholt06/College-Reaper into eaholt06-scheduling_models
Merge branch 'eaholt06-scheduling_models'
Merging and updating latest work, docs, coverage
Merge branch 'master' of https://github.com/jimcavoli/College-Reaper

Conflicts:
	app/controllers/schedules_controller.rb