Added Collision detection
to all shapes except for triangle
not sure how to do the triangle
Merge branch 'master' of github.com:pierfier/APCompSciAsignments