brought gamepad support back
Merge branch 'master' of https://github.com/endoearth/ggj2014