new commit
Merge branch 'master' of github.com:dhagan/express3-mongodb-bootstrap-demo

Conflicts:
	views/shared/navigation.ejs