Marsyas section added.
Manual merge.
Merge branch 'master' of https://github.com/mrgimo/music_classification

Conflicts:
	src/sections/phase2.tex