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

Conflicts:
	app/assets/javascripts/trucks.js
edit
finish user feature
bubbles
bubbles
bubbles
commit
Merge branch 'master' of https://github.com/camicano/food_trucks_app into camila
stylin
styling
commit
Merge branch 'master' of https://github.com/camicano/food_trucks_app into camila
infobubble