Merge pull request #5 from linduxed/searching

Conflicts:
	app/assets/stylesheets/_items.sass