just
 Please enter the commit message for your changes. Lines starting
conflict
Merge branch 'master' of github.com:rkophs/SortingLists

Conflicts:
	SortingLists.xcodeproj/project.xcworkspace/xcuserdata/rkophs.xcuserdatad/UserInterfaceState.xcuserstate