fixed merge conflict
initial dual laser support
Merge branch 'master' of https://github.com/machinoid/FabScan100

merging