Minor changes
Merge branch 'master' of https://github.com/anpar/oz-project-fsa12

Conflicts:
	report/report.pdf
	report/report.tex