added fourth line to second.txt
Merge branch 'master' of https://github.com/ljuboraicevic/test

Conflicts:
	second.txt