committing outstanding changes due to web editing
Added bundler gemfile
Merge branch 'master' of https://github.com/rainratte/trash