searching works
Merge branch 'master' of https://github.com/horngep/Shelf

Conflicts:
	Shelf.xcodeproj/project.pbxproj