dsfsd
Merge branch 'master' of https://github.com/LuMerkle/hrm

Conflicts:
	qatest