merging like a fool
Merge branch 'master' of http://github.com/thraxismodarodan/ArcaneTraveler

Conflicts:
	src/com/example/arctrav/Sigil.java
fixed.  Probably like a fool, but whatever.