First commit)
Merge branch 'master' of https://github.com/Bat-Chat/mix2

Conflicts:
	.gitignore
	README.md