task 4 done, includes task 5 drama: UISegmentedControl
fixed merge conflict