Merge branch 'master' of https://github.com/timdd2100/PresentChangeUI

Conflicts:

PresentChangeUI.xcodeproj/project.xcworkspace/xcuserdata/timkao.xcuserda
tad/UserInterfaceState.xcuserstate
	PresentChangeUI/dataSource.m
--merge

--merge
Merge branch 'master' of https://github.com/timdd2100/PresentChangeUI

Conflicts:

PresentChangeUI.xcodeproj/project.xcworkspace/xcuserdata/timkao.xcuserda
tad/UserInterfaceState.xcuserstate
	PresentChangeUI/dataSource.m