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

Conflicts:
	objective-c_-initwithframe:_method.m