files
Merge branch 'master' of https://github.com/blak422/proangularbook

Conflicts:
	sportstore/.dpd/pids/mongod
	sportstore/data/-deployd.0
	sportstore/data/-deployd.ns
	sportstore/data/local.0
	sportstore/data/local.ns