Updated Data, Service Class to Match New DataBase
Merge pull request #52 from kguischard13/master

Updated Data, Service Class to Match New DataBase