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
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