init the project
Merge branch 'master' of github.com:juyod/otochat

Conflicts:
	.gitignore