initial commit
Merge remote-tracking branch 'desktopScanner/master'