Teams is at the point where it is completely implemented throughout the code, but now there are some bugs to deals with. Specifically, a ton of null pointer errors. Fortunately, the errors coming from NeutralTeam should be the same as those coming from PlayerTeam, so if we find one, we find them all.
The game now runs with Team class implemented.

Currently a bug with ships. Haven't investigated yet.
Also, UserShip does not work properly any more because the "ship" variable used in SimpleTest is out of scope. I think keycheck methods need to be moved to the UserShip class
Fixed all null pointed exceptions associated with the addition of Team class. That said, I have yet to fix the controls for UserShip (David, I'm going to let you do this, because I am not 100% sure how the keyboard input methods in SimpleTest work).
Merge branch 'teams'

Conflicts:
	SpaceGame/src/game/SimpleTest.java
	SpaceGame/src/objects/Bullet.java
	SpaceGame/src/ships/Ship.java

Merged with branch 'teams'. My Eclipse isn't working for some reason, so I haven't been able to test yet. Will investigate issues and test whether merge was successful.
master and 'teams' successfully merged. For some reason, the Fighter being spawned doesn't move when 'accelerate()' or 'cruiseControl(10.0)' is called.