Added pub sub
Merge branch 'master' of github.com:tilt/socially_awkward

Conflicts:
	Gemfile