merge README
merge README
Merge branch 'xus'
update gemfile for heroku
large change