Imenik Commit
Merge branch 'master' of https://github.com/ikrstic/PA2Kol

Conflicts:
	.gitignore