Victor
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/.idea/workspace.xml
	Game/src/edu/csupomona/cs/cs141/NinjaGame/Bullet.java
	Game/src/edu/csupomona/cs/cs141/NinjaGame/Ninja.java
	Game/src/edu/csupomona/cs/cs141/NinjaGame/NinjaGame.java
	Game/src/edu/csupomona/cs/cs141/NinjaGame/Player.java
Onto Comments!