nicu are mere
Merge branch 'master' of https://github.com/alexberce/hack-tm

Conflicts:
	readme.txt