conflicts stuffs
merge problems stuffs
Merge branch 'master' of https://github.com/ITNano/2DPlatformFighter
merge problems