commit 11:27
Merge branch 'test_branch_conflict'

Conflicts:
	UISliderChangeValue/ViewController.m