Repairing tests and addidng support for image
Merge branch 'master' into test_photo_uploads
Fixed merge
:
Gems
adding truck is broken
merge conflict
Merge conflict
Fixing tests
Merge branch 'truck_pictures' of https://github.com/Maimer/what_the_truck into test_photo_uploads
Tests pass
Merge branch 'master' of https://github.com/Maimer/what_the_truck into test_photo_uploads
Prepare for merge
Removed the new review from manufacturer show page controller (new review was moved to its own page).  Removed destroy from non-admin controllers. Fixed a type in the seeds file.
should be on css branch
Merge branch 'master' of https://github.com/Maimer/what_the_truck into add_review_email
Check deliveries array
Add bootstrap to kaminari
switching to css branch
Merge pull request #35 from Maimer/pagination_bootstrap

Pagination bootstrap
Added title and header images