adds test apps
Merge branch 'master' of https://github.com/dglittle/nodesk

Conflicts:
	web.js