novo
a
aa
aaa

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

Conflicts:
	porocilo/porocilo.synctex.gz