fix
Merge branch 'master' of https://github.com/alinulms/ChatZappFinal

Conflicts:
	Chatzapp.v12.suo