CBashir - 1.0.1 - Hotfix
dunno
Merge branch 'hotfix'

Conflicts:
	Test1/Test1.xcodeproj/project.xcworkspace/xcuserdata/Carl.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'iss53'

Conflicts:
	Test1/Test1/ViewController.m