profile_photo_uploader_spec.rb
complete photouploading feature for user registration
Fix merge conflict
Implement fog and AmazonS3 storage
Implement fog and amazon S3
Merge pull request #34 from LaunchAcademy/carrierwave

Carrierwave
Resolve merge conflict - merging in master