linijka2
linijka conflict
Merge branch 'master' of https://github.com/WRIM/Test

Conflicts:
	todo.txt