jubjub, wizard, and lair
Merge branch 'master' of https://github.com/ebeachly/CSCE361ProjectV2

Conflicts:
	workspace/CSCE361Project/src/superClasses/Parser.java
	workspace/CSCE361Project/src/superClasses/World.java