Add alternate basalt/marble cycling support
Merge branch 'master' of https://github.com/Shukaro/Artifice.git

Conflicts:
	README.md