apps
Merge branch 'master' of https://github.com/cancel888/testnode

Conflicts:
	app.js
hello