the big commit
paths, lock functions, timer, parser, logging, multi client
parser conflict
Merge branch 'master' of github.com:murphy2/sourceBox