worked on task 1
Merge branch 'master' of https://github.com/jreijrink/2IV35_Visualization

Conflicts:
	Assignment 1/Report/techniques.tex