Conficts hopeful fix and hedge is now addede
final changes in GameUtil
Merge branch 'master' of
https://github.com/CameronProbert/SWEN222Project.git

Conflicts:
	Cat and Mouse/src/catgame/logic/GameUtil.java