First commit
Merge branch 'master' of github.com:robertmain/chatapp

Conflicts:
	README.md
Removed node modules folder from version control£