update
Merge branch 'master' of https://github.com/siddharthbhargava/ChatoverCloud

Conflicts:
	ChatoverCloud/util/asdf.js