club collision (still buggy)
Merge branch 'master' of https://github.com/JD557/PoolAR

Conflicts:
	main.cpp