merging MainController.java
Pulling latest edits
Merge branch 'master' of github.com:Tadimsky/vooga
pull code
tried load function, doesn't work
Merge branch 'LevelEditor' of https://github.com/Tadimsky/vooga into LevelEditor
Merge branch 'master' of github.com:Tadimsky/vooga
Integrated with Input team's input
resolve merge conflict
resolve merge conflict
add back the occupied if statement in paint

remove and clear rely on this to work
Some clean up
merge conflicts
merged conflicts
created seperated saver and loader
merging GameController.java
Merge branch 'master' of github.com:Tadimsky/vooga
Merge branch 'master' of github.com:Tadimsky/vooga
changed file format to XML
Added ICommandable interface for communication between commands and server