Error thing updated
Removed other thing
Merge branch 'master' of https://github.com/olavemil/TDT4255ex1

Conflicts:
	report/chapters/solution/design.tex