scotty updates
scotty updates
Merge branch 'master' of https://github.com/dmp1ce/ownersmanual-base