Update README.md
Merge branch 'master' of https://github.com/diegobiavati/colchonet
resolve conflict and undelete Gemfile
update for resolv conflicts
Update README.md
Test for bash