Committing
Merge branch 'master' of github.com:roboime/ip-jan-bramigk

Conflicts:
	tex_template/report.tex