got collision detection with pipes working
Merge remote-tracking branch 'Project2/collision'

Conflicts:
	.gitignore
	src/HelicopterCinderApp.cpp