infobox
Merge branch 'master' of https://github.com/camicano/food_trucks_app

Conflicts:
	app/assets/javascripts/trucks.js
edit
bubbles
bubbles
bubbles