Merging
Changed heuristic.

Merge branch 'master' of github.com:matthewhinkle/cs485-gensched

Conflicts:
	src/schedule/Day.java
	src/schedule/ScheduleHeuristic.java