first commit
Ver 2
ver 2.1
Merge branch 'master' of https://github.com/VladoAng/DojoChat

Conflicts:
	.gitignore