controller tweaking
Merge branch 'master' of https://github.com/Velro/game-off-2013