sync
Merge branch 'master' of https://github.com/EECS214/TeamIndia

Conflicts:
	Game/src/Launcher/GameStart.java
	Game/src/Launcher/Launcher.java