update 9:37pm 12/9/2013
update 9:55pm 12/9/2013
Merge branch 'master' of https://github.com/pmarti28/mazeRPG

Conflicts:
	bin/.gitignore
	bin/GameIcon.class
	bin/Location.class
	bin/MazeBoard.class
	bin/MazeDemo.class
	bin/Path.class
	bin/Player.class
	bin/Vertex.class
	src/GameIcon.java
	src/MazeBoard.java
	src/MazeDemo.java