edit player controller
Merge branch 'master' of https://github.com/chiNchiN29/finalv3