Merge pull request #29 from nolanfilter/Geo

Conveyor and Multitrigger sets
adding fix
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into Geo