no necessary
Merge branch 'master' of https://github.com/Team306/NewBilliards

Conflicts:
	CollideEngine.h
	Cue.cpp
	GameClient.cpp