renaming commits
Merge branch 'master' of github.com:Tadimsky/vooga
merging gamecontroller
merging gamecontroller