added s3 server for image uploads
fixed merge issues
Merge pull request #30 from bshore01/amazon-s3

added s3 server for image uploads