fixing controllers
Merge branch 'master' of https://github.com/gabby2212/fbhack