Corrected compiler errors
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop

Conflicts:
	docs/deliverables/final-report/final-report.tex