pulling game changes
Merge pull request #12 from Tadimsky/LevelEditor

update our branch
Made healthbars have weird gradient. Added near method to Location. Made camera movement stop correctly
merging 4/18
merging new changes 4/18
Moved large amounts of functionality to the AbstractThreadContainer, fully implemented lobby and gameserver as subclasses of room
Commented up server classes

Conflicts:
	src/vooga/rts/networking/server/AbstractThreadContainer.java
Deleted empty serverInfo, created GameMessage for games to extend, stamp time in abstractThreadContainer

Conflicts:
	src/vooga/rts/networking/server/AbstractThreadContainer.java
Changed name of main, refactored method names, formatted classes
Changed execute to affectServer
More commenting/checkstyle
update menu screen image for only single player
Finished commenting up server
networking merge
Merge branch 'server-refactoring' of https://github.com/Tadimsky/vooga
Merge pull request #14 from Tadimsky/server-refactoring

Server refactoring
Merge branch 'master' of github.com:Tadimsky/vooga
testing commit message for email add
commit testing, changed email
Merging from master