sample app
first commit
Merge branch 'master' of github.com:satyapriya/chat_app

Conflicts:
	.gitignore