cs and rf
completed checkstyle for controllerSuite
Merge branch 'scrolling_platformer' of https://github.com/duke-compsci308-spring2013/vooga into scrolling_platformer
merging and solving conflicts and...
small change to ensure new workspaces are active by default
...
cs
Merge branch 'scrolling_platformer'