Report
Merge branch 'master' of https://github.com/mistelip/CircleOfLife

Conflicts:
	doc/latex/reportTemplate.tex