problem fixed
Merge branch 'master' of https://github.com/bojangles495/THE_GAME