added potato
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/javascripts/map.js