added comment 3
Merge branch 'master' of https://github.com/kbacalso/GitST

Conflicts:
	GitXcode/ViewController.m