Lots of non-hard coding changes made, though lacking progress
Merge branch 'master' of github.com:jthompsonNB/PetStore