took out conflict markers
Merge remote-tracking branch 'origin/master'
changed readme
added scanning utilities
cleaned up qtutils
Update readme
added chunking for steppermotor client
updated steppermotorgui to use chunked stepper motor
Merge remote-tracking branch 'origin/master'
Merge pull request #1 from creilly/master

scanning stuff added