Merge branch 'master' of https://github.com/modmuss50/Transcraft

Conflicts:
	Transcraft.iml