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

Conflicts:
	CS164/Golf/GolfLevel.cc
	CS164/Golf/GolfLevel.h
	CS164/Min.xcodeproj/project.pbxproj
	CS164/Min/Director/Director.cc
	CS164/Min/Director/Director.h
.