testing git on this machine
Merge branch 'master' of https://github.com/stevepsk/softdoc