Still can't merge like a proper gituser.
Fixed merge errors.

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

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