nolan test
Base Character,Item, etc. definitions
huh
Major progress in battle/character class system
Merge branches 'battle' and 'master' of https://github.com/math1man/SuperMacalester into battle

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
Feels good man
Added structural framework for battle mode and adjusted framework for world mode
Moved the move and changeGrid methods from Entity to MapCharacter. Added Door and updated interactions
Removed some constructors that still used the old int x int y notation instead of just Vector2s
Added getters and setters to Door
merged changes from battle branch
Starting a static Dialogue class for displaying dialogue, narration, etc.
Starting a static Dialogue class for displaying dialogue, narration, etc.
Dialogue is now designed only for WorldScreen usage
Adding to Dialogue
Starting to get the structure of the battle down. Comments/criticism are welcome.
Merge remote-tracking branch 'origin/battle' into battle

Conflicts:
	.idea/workspace.xml
Added all (?) functionality to parseDialogue except the actual line parsing
Added a filler to the NPC interact method
Improved Interaction behavior by creating an interaction class that can get passed up the hierarchy
Made Dialogue into DialogueHandler and made it nonstatic
Dialogue now holds the actual dialogue data, the handler holds the dialogue window size and deals with setting it up to be rendered
Dialogues no longer deal with changing screens or game modes, that goes into the Interaction