Updating Help Screen and a new map
fixes
Merge branch 'master' into Kmae
fixes
fixes
new map
Merge branch 'Kmae' into Networking

Conflicts:
	CSC380GameProject/src/edu/oswego/tiltandtumble/screens/GameScreen.java
	CSC380GameProject/src/edu/oswego/tiltandtumble/screens/MainScreen.java