.
Merge branch 'master' of https://github.com/daveleroy/CS164

Conflicts:
	CS164/Golf/GolfBall.h
.