Adding search functionality and image for search bar
Merge changes

Conflicts:
	app/app.js
Merge branch 'master' of https://github.com/ilh19/HoustonBike