fix errors
Merge branch 'master' of github.com:flea89/report-semester-project

Conflicts:
	FinalWork.tex