fixed conflict in main
Merge branch 'master' of https://github.com/Incenium/platformer
added resource file, spritesheet file and animation file