better outline
Merge branch 'master' of https://github.com/MissionBit/chat-client

Conflicts:
	www/index.html