Dropped fog.rb from repo
moved controller tests
tried to add spec for carrierwave (nonworking)
Merge branch 'carriertest' into lab2