Readme updated
Gemfile updated
Merge branch 'master' of github.com:rcsole/xing-meets-robots

Conflicts:
	Gemfile
	README.md