Pre-merge commit
Merge branch 'develop' of https://github.com/antifinidictor/Mystery into develop
Adjusted collision code so surface collisions come first
Saved project