David heuristic and Hasselhoff heuristic added
Merge remote-tracking branch 'origin/master'

Conflicts:
	sokoban/Heuristic.java
	solutionEvaluator/SolutionEvaluator.java
David heuristic and Hasselhoff heuristic added