fix mergeconflicts

README.md

mesecons/oldwires.lua

mesecons/settings.lua

mesecons_button/init.lua

mesecons_delayer/init.lua

mesecons_extrawires/corner.lua

mesecons_extrawires/crossover.lua

mesecons_extrawires/tjunction.lua

mesecons_extrawires/vertical.lua

mesecons_hydroturbine/init.lua

mesecons_insulated/init.lua

mesecons_luacontroller/init.lua

mesecons_microcontroller/init.lua

mesecons_movestones/init.lua

mesecons_noteblock/init.lua

mesecons_pistons/init.lua

mesecons_powerplant/init.lua

mesecons_pressureplates/init.lua

mesecons_receiver/init.lua

mesecons_torch/init.lua