Commit before merge.
Merge branch 'master' of https://github.com/dawguy/CS2340MULE

Conflicts:
	MuleGame/src/managers/GameManager.java