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
should be on css branch
switching to css branch
Merge conflict
Merge conflict
Merge pull request #34 from Maimer/test_photo_uploads

Test photo uploads