init commit
Merge branch 'master' of https://github.com/alex-mironov/node-rest-api

Conflicts:
	app.js