ignore
ignore
Merge branch 'master' of https://github.com/bfh-evg/univote2

Conflicts:
	.gitignore
	doc/report/report.aux
	doc/report/report.log
	doc/report/report.out
	doc/report/report.pdf
	doc/report/report.synctex.gz
	doc/report/report.toc
tuesday