Sprawko
Merge branch 'master' of github.com:unoduetre/ACoDIS

Conflicts:
	report/article.aux
	report/article.tex