Merge pull request #41 from zcmoore/master

Removed LWJGL dependencies. Map package needs to be re-written
Merge branch 'master' into swing_gui
Merge remote-tracking branch 'origin/master' into swing_gui
Merge pull request #42 from zcmoore/master

Added Map and Token functionality
Abstracted JFrame to game frame, updating GUI's
GUI improvements
Merge remote-tracking branch 'origin/master' into swing_gui

Conflicts:
	src/main/java/edu/asu/ser215/pathfinder/Game.java
	src/main/java/edu/asu/ser215/pathfinder/gui/MapScreen.java
Formatted MapScreen file. Added codeformat.xml to standardize code
formatting.
Merge pull request #44 from zcmoore/master

Added skills.xml, + loading for skills, abilities, and items. Added Token movement and base interaction.
Relocated some tests, removed unnecessary packages, and moved the tests
outside of src.
Removed old test packages and directories.
Updated pom.xml
Merge remote-tracking branch 'origin/master' into swing_gui

Conflicts:
	src/main/java/Tests/TestCharacterPackage.java
	src/main/java/edu/asu/ser215/pathfinder/Game.java
	src/main/java/edu/asu/ser215/pathfinder/gui/MapScreen.java
Merge pull request #45 from sethmoon/swing_gui

Swing gui
Merge pull request #9 from sethmoon/master

Merge branch 'master' into swing_gui