motorcycle show view incl booking and availabilities
Merge branch 'master' of github.com:ljdegastines/drivemefree into add-edit-bookings
adding zipcode-price-city to motorcycles
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
enlever quelques champs en doublon avec LJ
Merge pull request #30 from ljdegastines/adding-mandrill

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

Conflicts:
	db/schema.rb
Merge pull request #28 from ljdegastines/adding-city-zipcode-price-to-motorcycle

adding zipcode-price-city to motorcycles
added index for bookings
updated seed for city and zipcode
Merge pull request #32 from ljdegastines/add-edit-bookings

Add edit bookings
Merge branch 'master' into form-for-motorcycle-creation
used render form in new motorcycle