Commit Whip Control
Merge branch 'master' of https://github.com/encephalopathy/agent_smith_ggj2014
Keep forgetting things, sorry :/