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
Add admin tests
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.
Add bad delete scenarios
Add comments
should be on css branch
switching to css branch
Added title and header images
Merge pull request #36 from Maimer/odds_and_ends

Odds and ends
Merge conflict