Merge branch 'master' of https://github.com/other170/gitDemo

Conflicts:
	gitDemo.xcodeproj/project.pbxproj
fffddd