i wroted more thingies
Merge branch 'master' of github.com:mathiasose/eeds

Conflicts:
	exercise2/report/wfi.tex
finish merge