Commit before leaving
Merge branch 'master' of https://github.com/jd1123/johnnydiabetic