Testing merge
Merge branch 'master' of https://github.com/centurionas/test

Conflicts:
	GitTest.xcodeproj/project.pbxproj