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

Conflicts:
	MuleGame/bin/gameObjects/Map.class
	MuleGame/bin/screens/SettingsScreen.class
	MuleGame/src/screens/SelectTilesScreen.java
	MuleGame/src/screens/SettingsScreen.java