initial commit, copied from platformer tutorial
fixed gitignore conflict