Merge branch 'master' of https://github.com/maryclin/fhstest

Conflicts:
	README