x
iOK
wqMerge branch 'master' of github.com:rothfield/doremi-script

Conflicts:
	comp.pid
	watcher.pid
Merge branch 'master' of github.com:rothfield/doremi-script
z