merging
Merge branch 'master' of github.com:mathiasose/eeds

Conflicts:
	exercise2/report/description.tex
	exercise2/report/sound.tex
more about sound, DMA