Merge branch 'master' of https://github.com/BenjaminBriggs/Xcode-Snippets

Conflicts:
	rotation_for_ios_6.m