Advanced the collision testing
Merge branch 'master' of https://github.com/skruven96/WebInfection

Conflicts:
	js/Shapes.js