Tightened collisions with meteor
Merge branch 'master' of github.com:muthukdi/CppFinalProject