what have I done?
Merge branch 'master' of https://github.com/4aiman/magichet

Conflicts:
	mods/greenstone/init.lua
half-through
even closer replica of lamps