Edited description of exercise.
Merge branch 'master' of https://github.com/olavemil/TDT4255ex1

Conflicts:
	report/chapters/introduction/descriptionoftheexercise.tex