Merging code with Bree, and I still don't git what I'm doing.
STILL don't know how to merge properly.

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

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