nolan test
Base Character,Item, etc. definitions
huh
Merge pull request #2 from math1man/dev

Dev
Merge pull request #3 from math1man/dev

Specifying Character as MapCharacter to avoid conflict.
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
merged changes from battle branch