Cleanup
Merge branch 'master' of https://github.com/ProjectNarna/NarnaCraft.git

Conflicts:
	NarnaBase.java