temporary not conisdering time and consolidated 3 soft constrain checks into 1
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project

Conflicts:
	sampleInput.txt.out
	src/examSchedule/parser/ExamSchedule.java
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project

Conflicts:
	src/examSchedule/parser/PredicateParser.java