It's done. I think.
It's done. I think.
It's done. I think.
It's done. I think.
Merge remote-tracking branch 'origin/Victor' into Victor

Conflicts:
	Game/src/edu/csupomona/cs/cs141/NinjaGame/Engine.java
	Game/src/edu/csupomona/cs/cs141/NinjaGame/UI.java
It's done. I think.