fix2
Merge branch 'master' of https://github.com/michalvasko/ganprint

Conflicts:
	test.txt