new
Merge branch 'master' of https://github.com/kendetta/HMS-Git

Conflicts:
	HMS/users.db