Merge branch 'master' of github.com:ooopscc/XcodeSnippets

Conflicts:
	documentation_comments.m