Set up S3 storage, images uploading
correct mistakes made on master before merge with deploy
Corrected master errors before merge with deploy
Merge branch 'master' into deploy
"i"
Carrierwave and s3 working
Switch Database to Postgres