Fixed movement with controller
erge branch 'master' of github.com:proudaut/GGJ