Adding sorting of properties
Merge branch 'master' of github.com:cgfrost/nodejs-getting-started

Conflicts:
	package.json