resolve conflict and undelete Gemfile
Merge branch 'features' of https://github.com/diegobiavati/colchonet into features

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
update README