Fixed some IO bugs, pushing up branch so I can get to it from another machine.
Made it so that you can also use Ctrl to rotate shapes.
Fixed merge conflicts.