test game controller
merge conflict
merge conflict
game controller battle
Merge branch 'master' of https://github.com/elarion/poogameproject
add jquery