I'm not sure

It said added a “Collision Layer” property thing but I don’t remember
doing it.
Merge branch 'gh-pages' of https://github.com/MissionBit/operation-peach into gh-pages

Conflicts:
FirstLevel.tmx
new changes. going on douglas' comp