Intended to conflict version
Merge branch 'master' of https://github.com/akandra/mdhag

Conflicts:
	test.txt