updated readme
updated gemfile
Merge branch 'development'