Version inicial
Version inicial
Merge branch 'master' of https://github.com/diegopau/chattyhive-android

Conflicts:
	.gitignore
	README.md