Some chill 8-bit tunes
Added a battle to the plot_temp
Merge remote-tracking branch 'origin/battle' into battle
Added soundsss
Merge branch 'battle' of https://github.com/math1man/SuperMacalester into battle_test
Added soundsss
Fixed the starting QuestEntity's dialogue not showing up
Added a static toJsonString method to the SuperParser that converts the the specified object to a json string
Merge remote-tracking branch 'origin/battle' into battle
Added soundsss THAT WORK IN BATTLES!!!!
Merge remote-tracking branch 'origin/battle' into battle

Conflicts:
	src/com/arnopaja/supermac/GameScreen.java
Fixed jeff
Merge remote-tracking branch 'origin/battle' into battle
worldMusic and battleMusic are now Music instances instead of sound instances
renamed a lot of the music and sound objects
Settings now holds a volume float and a isClean boolean. Volume is implemented, isClean is not
Rather than a setDefending method, BattleCharacters now have defend() and clearDefend() methods, which set isDefending to true and false respectively
Battle now handles the case where a character tries to use a spell when he has none
Improved the spell dialogue a bit
Added an isEmpty() and other methods to SpellBook
Improved some things with Interaction
Completely overhauled Interaction class.
Interaction is now an interface, and all classes that previously implemented InteractionBuilder now implement Interaction
Interactions is an enum that holds unique Interactions (NULL, END_DIALOGUE, CLOSE, RESET)
MultiInteraction has replaced the former Interaction.combine() methodology
MultiInteraction holds a List of Interactions, and provides attach methods that append interactions to the list.
Comments
Fixed a bug in Battle where you could click anywhere and it would push a null action
Added attack misses for a more complete feel to the battle system.
Removed debug code