Application now runs
Merge branch 'master' of https://github.com/sorahavok/discord-chat

Conflicts:
	.gitignore
	package.json
	web.js