#Add music to Mario Castle, Dialogue, King Kai Music
Merge branch 'master' of https://github.com/kyle-copeland/projectdove

Conflicts:
	Data/Scenes/DialogScenes/MarioWorld/MarioLevelOnePostTwoPre.Scene.res
	Data/Scenes/DialogScenes/MarioWorld/MarioLevelOnePre.Scene.res
	Data/Scenes/FinalWorlds/LinkWorld/LinkBoss.Scene.res
	Data/Scenes/FinalWorlds/MarioWorld/MarioCastle.Scene.res