had to add a "photo" colomn to photos model
carrierwave basic
carrierwave with RMagik
amazon server bug cant upload
testing
changed aws keys
Day 1 toby changes
fix merge conflict
fixed merge conflict