Just to pull
Merge branch 'master' of https://github.com/MyEyes/GGJ2014
Added effects to Test state
Using keyboard right now, remap the keys to a gamepad