added collision detection
Merge branch 'master' of github.com:helixkey/graphics_final