First software commit.
Merge branch 'master' of github.com:francesco-ficarola/WoChat

Conflicts:
	.gitignore