move stuff again, fix teleporters, change some colors
Merge branch 'master' of https://github.com/nutsforalmonds/RadChip
Merge remote-tracking branch 'upstream/master'