update
Merge branch 'master' of https://github.com/rstr74/npmvc-express-example

Conflicts:
	readme.md