everflame #5
Merge branch 'master' of https://github.com/escamuche/STAB.git

Conflicts:
	stab/src/com/stab/data/adventure/CryptEverflameAdventure.java