Swapped controls for rotating blocks.
Fixing binary conflicts.
Merge branch 'level_design' of github.com:bbrouse/shapesmith into level_design