moved some tests files for testing frameworks into tests/, none of them work
Merge branch 'master' of github.com:fhinkel/tryM2

Conflicts:
	m2server.js
Merge branch 'master' of github.com:fhinkel/tryM2