awdawd
Merge branch 'master' of https://github.com/Akodiat/Ljudjagare

Conflicts:
	Documents/thesis/Implementation/Sound.lyx