done
adds amazon init
update yaml
maybe actually fix the yaml problem
maybe fixes yaml
add carrierwave init
add aws key
fix merge conflcits in post.rb and gemfile + .lock
fix merge conflicts in lock file
rm merge conflict in schema.rb
add ds store to gitignore
fixes travis.yml AWS key value
unescapes underscores in travis encrpyt AWS keys
Merge pull request #7 from trosborn/images

done