hows this working
'updateing'
Merge branch 'master' of https://github.com/richmondwatkins/quest4change

Conflicts:
	app/static/js/es6/maps.es6.js
'added searchResults routes and jade'