added our solution from my branch
initial commit week 6
Merge branch 'master' into individual/axel

Conflicts:
	week5/Lab5.hs
	week5/Week5.hs