swg
Merge branch 'master' of https://github.com/hacknyuday/hacknyu

Conflicts:
	firechat-master/examples/anonymous_auth.html
dicks