Changed package name to what it should be
Merge branch 'master' of ssh://git@github.com/maxfarnham/PharmManager.git
Testing in GUI. Put our names on GUI