...
Merge branch 'master' of github.com:6366295/uva_shazam_project

Conflicts:
	vogel_shazam.py