fixing commit problems
Merge branch 'master' of https://github.com/bjarkehs/cs_440_mp4.git

Conflicts:
	GridWorld/src/gridworld/Main.java