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
Merge pull request #36 from Maimer/odds_and_ends

Odds and ends
Merge conflict
Merge conflict