initial version
Merge branch 'master' of https://github.com/mreib/Nicechat

Conflicts:
	.gitignore