Fixing bad merge in config.ru.
Removing welcome page from config.ru
Revert "Adding websockets example."

This reverts commit 34ebc935f0ed5a37d2a0112b866b105b9b3acd2d.

Conflicts:
	Gemfile
	Gemfile.lock