a
popravek
novo

Merge branch 'master' of github.com:spelapovrzenic/APPR-2014-15

Conflicts:
	podatki/2tabela.csv
	uvoz/uvoz.r