added image uploading via carrierwave
trying to get s3 to work
fixed s3, added default img and image white list
fixed conflict
fixed gemfile
added improper file test
fixed changes
Merge pull request #7 from dgreenbe77/user_post_pic

User post pic