Revert "Merge pull request #12 from vlatkokaplan/branch1"

This reverts commit b80fca95941693d674206fc18794002cca846d20, reversing
changes made to 480cfe02b130932e9b35aae84256f56417ee1125.

Conflicts:
	testfile2.txt