Merge branch 'master' of https://github.com/dhruvil1990/search.git

Conflicts:
	app/views/test/index.html.erb