working on the reservation
Merge branch 'master' of https://github.com/NVISIA/BackboneWorkshop

Conflicts:
	webapp/js/restaurant.js
working on the reservation
Merge branch 'master' of https://github.com/NVISIA/BackboneWorkshop
working on the reservation