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

Conflicts:
	Game/src/Launcher/Character.java
	OfficeClient/.DS_Store
	OfficeClient/build/classes/officeclient/Character$1.class
	OfficeClient/build/classes/officeclient/Character$CharacterType.class
	OfficeClient/build/classes/officeclient/Character$Direction.class
	OfficeClient/build/classes/officeclient/Character.class
	OfficeClient/build/classes/officeclient/Missile.class
	OfficeClient/build/classes/officeclient/OfficeClient$1.class
	OfficeClient/build/classes/officeclient/OfficeClient$KeyMonitor.class
	OfficeClient/build/classes/officeclient/OfficeClient$PaintThread.class
	OfficeClient/build/classes/officeclient/OfficeClient.class
	OfficeClient/nbproject/private/private.properties
	OfficeClient/nbproject/private/private.xml
	OfficeClient/src/.DS_Store
	OfficeClient/src/officeclient/OfficeClient.java
Merge branch 'master' of https://github.com/EECS214/TeamIndia
update game framework