underscore.js
Merge branch 'master' of https://github.com/mechlabDegenkolbe/UnsichtbarerFaden

Conflicts:
	NodeServer/html/frontend/index.html