The actual final commit'
Merge branch 'master' of https://github.com/crecord/ClickyClumsyTechFiles