Merge remote-tracking branch 'origin/map_glitchout' into cutscenes_shrines
Merge remote-tracking branch 'origin/cutscene_music_carryon' into cutscenes_shrines
Change Shrine Code To Allow Diff Cutscenes
Added arbitrary shrine walljump
Merge remote-tracking branch 'origin/master' into cutscenes_shrines
Merge pull request #25 from variousauthors/cutscenes_shrines

I can't say I understand why we need multiple "enter shrine" events for the same shrine, but I love that @clangmuir is writing code! MERGED