Merge pull request #33 from gnomicstudios/marks

Marks
lane collison fixed
Merge branch 'master' of https://github.com/gnomicstudios/GGJ13 into aranda
Merge pull request #34 from gnomicstudios/marks

fix to change weapon
clip entity sorting for depth
work-in-progress
Merge pull request #35 from gnomicstudios/aranda

Aranda
work-in-progress