Merge pull request #104 from hypercephalickitten/master

Disco Dodgeball is working.
Haunted Memories is actually working...