push #4

fitness functions in heuristic
Merge remote-tracking branch 'origin/master'

Conflicts:
	Soen321Project1/src/Heuristic.java