Git NEVER FUCKING WORKS
Merge branch 'master' of http://github.com/thraxismodarodan/ArcaneTraveler
I hope this works.
Conflicts:
	src/com/example/arctrav/Sigil.java
Edits and methods for Sigils, including dealing with fire, boarding parties, and basics of operations
Hope this works

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

Conflicts:
	src/com/example/arctrav/Crew.java
	src/com/example/arctrav/MainActivity.java
	src/com/example/arctrav/Sigil.java
OKAY, this is actually what I need to commit: merged added methods for Crew and Sigils, including damage, and basics of XP