updated
schema updated
Merge branch 'master' of github.com:TeaspoonLadies/teaspoon into denineworking
We added methods for all of the conversions