Update files from old repo
Merge branch 'master' of github.com:nathansherburn/Discussions-API

Conflicts:
	server.js