Resolving so I can sync
Merge branch 'master' of https://github.com/Shrie/AI-project

Conflicts:
	aifinalproject/Heuristics.java