merging pull for Input
Merge branch 'master' of github.com:Tadimsky/vooga
Merge branch 'master' of github.com:Tadimsky/vooga
merging commit for core implementation
Removed factory in favor of containing information in messages
Added comments, timer to matchmaker server
Changed name of LobbyContainer to lobby, added more communication methods
made changes to game elements classes
added attack package, modified action classes
tried to get input to work - input team has not finished coding so it doesn't work.
Moved back to old input.
Merge branch 'master' of https://github.com/Tadimsky/vooga
Revert "Removed local version of input - now using util"

This reverts commit 2be89b6a71ac0c51dbb27ce9720a32d556382109.
Revert "Deleted old input"

This reverts commit 358725ba0d7233fd5ba2c76eaeab14c4535493e1.
Revert "tried to get input to work - input team has not finished coding so it doesn't work."

This reverts commit 068bb315856e957f4351088389127cc0ce1e5a5d.
Merge branch 'master' of github.com:Tadimsky/vooga

Conflicts:
	src/vooga/rts/StartGUI.java
	src/vooga/rts/controller/AbstractController.java
Merge branch 'master' of github.com:Tadimsky/vooga
Made Camera scale by time
Formatted
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga