updated description
Merge branch 'master' of https://github.com/Incenium/platformer