Setup for collisions--still working
Merge branch 'develop' of http://github.com/abdullahfahad/project-elite-local into develop