Parts of working Shield (missing UI portions), working Bullet
Merge remote-tracking branch 'origin/master' into Victor

Conflicts:
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Briefcase.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Bullet.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Empty.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Engine.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Grid.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Ninja.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/NinjaGame.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Objects.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Player.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Room.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/Shield.class
	Game/bin/edu/csupomona/cs/cs141/NinjaGame/UI.class
	Game/src/edu/csupomona/cs/cs141/NinjaGame/Engine.java
	Game/src/edu/csupomona/cs/cs141/NinjaGame/Player.java
	Game/src/edu/csupomona/cs/cs141/NinjaGame/UI.java
Victor
Victor
Victor
Shield works now. It's really shitty code, but our code is all over the place to begin and I did what I could.