More GUI Changes

Infrastructure changes to allow for smoother battle GUI.
Merge branch 'master' of https://github.com/eastlack/Music-Theory-RPG