post/list
Merge branch 'master' of github.com:testSpri/nodeServer

Conflicts:
	app.js
comment modified