java doc on game3
Merge branch 'master' of https://github.com/EECS214/TeamIndia

Conflicts:
	Game3/build/classes/Buffs/SpeedBuff.class
	Game3/build/classes/Buffs/gameBuff.class
	Game3/build/classes/Launcher/Character$RemindTaskSpd.class
	Game3/build/classes/Launcher/Character.class
	Game3/build/classes/Launcher/GameStart$1.class
	Game3/build/classes/Launcher/GameStart$2.class
	Game3/build/classes/Launcher/GameStart$RemindL.class
	Game3/build/classes/Launcher/GameStart.class
	Game3/build/classes/Launcher/Launcher$1.class
	Game3/build/classes/Launcher/Launcher$2.class
	Game3/build/classes/Launcher/Launcher$3.class
	Game3/build/classes/Launcher/Launcher$4.class
	Game3/build/classes/Launcher/Launcher.class
	Game3/build/classes/Launcher/LauncherView.class
	Game3/build/classes/Launcher/Missile.class
	Game3/build/classes/Launcher/instruction.class
	Game3/nbproject/private/private.xml
	Game3/src/Launcher/Character.java
	Game3/src/Launcher/Enemy.java
	Game3/src/Launcher/GameStart.java
	Game3/src/Launcher/Launcher.java