login smalle dits
Merge branch 'master' of https://github.com/dsyang/cmunications

Conflicts:
	static/desktop/login.html
ui stuff / not really