Added Structure Tests
-Added Turret Tests
-Fixed incorrect formating in Turret class
Merge remote-tracking branch 'origin/master'
Merged with dmashuda
Merged changes with dmashuda
updates to StructureTest, .classpath, web.xml
fix some line ending issues, update round2 UML
don't keep .gwt-log under version control
added basic sprites
Merge remote-tracking branch 'Dan/master'

Conflicts:
	RTS/.classpath
	RTS/.gwt/.gwt-log
	RTS/junit/edu/ycp/cs320/rts/junit/StructureTest.java
	RTS/src/edu/ycp/cs320/rts/client/GetBoardService.java
	RTS/src/edu/ycp/cs320/rts/client/GetBoardServiceAsync.java
	RTS/src/edu/ycp/cs320/rts/server/GetBoardServiceImpl.java
	RTS/src/edu/ycp/cs320/rts/shared/Combatant.java
	RTS/src/edu/ycp/cs320/rts/shared/Interactable.java
	RTS/src/edu/ycp/cs320/rts/shared/Movable.java
	RTS/src/edu/ycp/cs320/rts/shared/Unit.java
	uml/round2.class.violet.html
updated RTS for rendering
Merge remote-tracking branch 'austin/master'

Conflicts:
	RTS/.classpath
	RTS/.gwt/.gwt-log