So many fixes.  Fire fixes, venting fixes, other fixes... nothing fully fixed, of course.
Fixed merge error in player- we both tried to fix the same thing.

Merge branch 'master' of https://github.com/thraxismodarodan/ArcaneTraveler

Conflicts:
	src/com/example/arctrav/Player.java