DELETE
Merge remote-tracking branch 'origin/master' into ALISTARR
Merge branch 'ALISTARR'
Merge branch 'master' of ssh://github.com/StickMen/SKED into ALISTARR
Update
Merge remote-tracking branch 'origin/master' into ALISTARR
Update on the Schedule Generator Subsystem...
algorithm is complete to generate valid schedules
Update on the Schedule Generator Subsystem...
algorithm is complete to generate valid schedules
fixed syntax on ISched, ConstraintSub, SchedSub, UserInf
Merge remote-tracking branch 'origin/master' into ALISTARR
Update on the Schedule Generator Subsystem...
algorithm is complete to generate valid schedules
Merge remote-tracking branch 'origin/Deploy' into ALISTARR
Update of course subsytsem, now the class should be able to query the server/database to make valid Course objects
Merge remote-tracking branch 'origin/Deploy' into ALISTARR
Merge remote-tracking branch 'origin/Deploy' into ALISTARR

Conflicts:
	Gemfile.lock
Fixing merge