changes
Merge branch 'master' of https://github.com/econ24/hpms

Conflicts:
	npm-debug.log