score display now updateable
merged errors
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject

mergeeeeeeee
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject

Conflicts:
	src/core/GameEngine.java

merging
Merge branch 'master' of https://github.com/ZacMcClain/FinalProject

merging