added map search control
adding pins
Merge branch 'master' into map-search

Conflicts:
	.gitignore
	Gemfile.lock
	app/views/layouts/application.html.erb
The "container" div was breaking the map.
Added multiple pins on the map.
Merge pull request #2 from moosechaser/map-search

Map search