Generic commit message
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject

Conflicts:
	src/core/GameEngine.java
theoretical overhaul of player move
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject