Commit local changes
Merge branch 'master' of github.com:ade25/bobtemplates.ade25
Merge with upstream
REsolve merge conflict