IT 1
Merge branch 'master' of https://github.com/keronas/AS3_platformer

Conflicts: