Citations included. Evaluation 2 tables undone...
conflicts?

Conflicts:
	cw ismir2014/ISMIR2014template.tex