make test environment
Merge branch 'master' of https://github.com/Event-Sync/server-notes into testenvironment

Conflicts:
	server.js
Merge branch 'testenvironment'