Revert "debug test"

This reverts commit 42fb5a8face96610367d3d2ec95866bf96e24639.
edit
MG
Merge branch 'master' into monsoulNewFeature

Conflicts:
	api/records.js
	web-server.js
New merge
monsoul
commit
gitignore
2en branch
2en branch
2en branch
merge new
change
web-server.js