I actually have no idea
Merge branch 'master' of https://github.com/thraxismodarodan/ArcaneTraveler

Conflicts:
	src/com/example/arctrav/MainActivity.java
	src/com/example/arctrav/Sigil.java
Merge branch 'master' of https://github.com/thraxismodarodan/ArcaneTraveler

Conflicts:
	src/com/example/arctrav/Conjuration.java
	src/com/example/arctrav/MainActivity.java
Merge branch 'master' of https://github.com/thraxismodarodan/ArcaneTraveler