added pizza class with attributes initialized
fixed test item
Merge branch 'pair-rickytux,catherinev'
Accepting merge from rick and catherine
fixing merge error