test commit
Merge branch 'master' of https://github.com/martin-nearsoft/nearsoft-guidelines