Merge branch 'master' of https://github.com/SoftLab-IS/budimoljudi

Conflicts:
	.gitignore
Popravljen zajeb
Merge branch 'master' of https://github.com/SoftLab-IS/budimoljudi