Merge pull request #28 from nolanfilter/Nolan

Adjusted Player Collision
Conveyor and Multitrigger sets
Merge pull request #29 from nolanfilter/Geo

Conveyor and Multitrigger sets