Changes
Merge branch 'master' of https://github.com/SamM/chatapp

Conflicts:
	package.json