commit
Merge github.com:arvai/chat-mvc

Conflicts:
	README.md