should be working, test
still broken on heroku
fixed carrier_wave
fixed some small errors
Merge pull request #16 from ZacharyAdams/carrier_wave

Carrier wave