project changes
Merge branch 'master' of https://github.com/shermes/TestLogging

Conflicts:
	TestLogger.xcodeproj/project.pbxproj