a private room link
Merge branch 'master' of github.com:nko4/pastel-734m

Conflicts:
	assets/javascripts/sweetnes.coffee