added the you know what
Merge branch 'dev' into functionFeature

Conflicts:
	sourcetreePractice/sourcetreePractice/ViewController.m