search functionality works with user and cheerup content
commiting before git push to master
Merge branch 'searchFeature' into anand

Conflicts:
	db/schema.rb