More GUI progress
Merge branch 'master' of https://github.com/maxfarnham/PharmManager.git
Updated GUI