motorcycle show view incl booking and availabilities
Merge branch 'master' of github.com:ljdegastines/drivemefree into add-edit-bookings
added booking to show view
included city, zipcode, price
included MH's comments
Merge pull request #29 from ljdegastines/add-edit-bookings

Add edit bookings
adding mandrill local + heroku
Merge pull request #30 from ljdegastines/adding-mandrill

adding mandrill local + heroku
schema updated
Merge branch 'master' into adding-city-zipcode-price-to-motorcycle

Conflicts:
	db/schema.rb