Music is now on DeathCurtain!
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	src/DisplayManager.cpp