3 new lines in test.txt
Merge branch 'moar-text-in-txt' of https://github.com/maninak/hy340-phase3 into moar-text-in-txt

Conflicts:
	test.txt
cleaned git crap
cleaned the head crap
Merge remote-tracking branch 'origin/moar-text-in-txt'
Merge remote-tracking branch 'origin/moar-text-in-txt'