i want new version
merge?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ExampleProject/Example.xcodeproj/project.pbxproj
	ExampleProject/Example/ExampleTableViewCell.m
	ExampleProject/Example/ExampleView.m
merging upstrream
ugh, conflicts
ignores