major december revision
Merge branch 'master' of github.com:Frankzor/Pillbox-Institute