prettied up map, added bike
Merge branch 'master' of github.com:nicoles/serendipities

Conflicts:
	app/assets/javascripts/map.js