updated rails
updated readme
merged gemfile.lock
updated gems