commit test confilg
Merge branch 'master' of https://github.com/QoolAtive/iWorkshop

Conflicts:
	UISliderChangeValue/ViewController.m