should be able to upload to s3
uploaded filename is random string now
fixed text parameter in post model
file uploads should work with the group changes
conflicts resolved
updated Gemfile.lock to solve Heroku issue
Merge pull request #16 from brucetoddlee/updated_gemfile_lock

updated Gemfile.lock to solve Heroku issue
Merge branch 'master' of https://github.com/brucetoddlee/good_or_evil