Merge remote-tracking branch 'dan/master'
Fixed UnitTest  junit tests

Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'dan/master'

Conflicts:
	RTS/junit/edu/ycp/cs320/rts/junit/UnitTest.java
Merge remote-tracking branch 'austin/master'

Conflicts:
	RTS/.classpath
	RTS/.gwt/.gwt-log
Merge remote-tracking branch 'dan/master'

Conflicts:
	RTS/.classpath
Implemented Vehicle and AttackVehicle classes
Added class for server game loop
Merge remote-tracking branch 'austin/master'
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'dan/master'
Merge remote-tracking branch 'Dan/master'
Merge remote-tracking branch 'dan/master'
Added basic implementation of Derby Database
Updated the UIController to accept action commands
Merge remote-tracking branch 'Austin/master'
Merge remote-tracking branch 'Justin/master'

Conflicts:
	RTS/.classpath
	RTS/.settings/com.google.appengine.eclipse.core.prefs