Added Map and Token functionality
Merge pull request #42 from zcmoore/master

Added Map and Token functionality
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