Merge branch 'master' of https://github.com/jthomson264/HCMSystem

Conflicts:
	app.py
	app.pyc