Renamed file to respect the convention
Play music while in konami code (not working)
Merge branch 'music_dev' of github.com:GL-MPRI-2014/GL_MPRI_2014 into music_dev

Conflicts:
	Makefile