init
Merge branch 'master' of github.com:Rabsztok/pubsub-rails

Conflicts:
	.gitignore
	README.md