Merge branch 'master' of http://github.com/jimcavoli/College-Reaper into database
Minor change in docs
Minor change in docs
Updated docs and some other things, I suppose
Updating coverage reports
Fixing little syntax error
Specs for helper methods added
Merge pull request #57 from gaurimishra/database

Specs For helper methods added
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
More docs added
Merge branch 'master' of https://github.com/jimcavoli/College-Reaper

Conflicts:
	app/controllers/schedules_controller.rb
Merging conflicts
Merge branch 'gaurimishra-database'
General fixes, spec fails still
General fixes, spec fails still
Updates to docs and coverage
Merge pull request #60 from hill1303/horrifically-broken-dont-touch

Gen Scheduler And Seed
Usual coverage and doc updates