#4
Merge pull request #4 from demagu/hotfix/third-hotfix

#4
Merge branch 'release/asd'

* release/asd:
  #4

Conflicts:
	test.txt