Merge branch 'master' of https://github.com/nuzhat86/SampleRepo

Conflicts:
	SampleGitProject/SampleGitProject/ViewController.m
Viewcontroller changes committed.