added more searches to place more stuff on the map
Finished scoring.
Fixed all the stuff
Merge branch 'merge-branch' into mine

Conflicts:
	js/apikey.js
	js/components/map.js
Finished app