another committee
Merge branch 'master' of https://github.com/vegiecat/Project8

Conflicts:
	Project8.xcodeproj/project.xcworkspace/xcshareddata/Project8.xccheckout