Removes the useless control function in gameobject / player
Merge branch 'master' of https://github.com/alvinlao/charm
Merge branch 'master' of https://github.com/alvinlao/charm
Merge branch 'master' of https://github.com/alvinlao/charm
Merge branch 'master' of https://github.com/alvinlao/charm
Merge branch 'master' of https://github.com/alvinlao/charm
Merge branch 'master' of https://github.com/alvinlao/charm
Fixes merge conflict
Ships move at a more reasonable speed now