Merge pull request #1 from catherinev/pair-kimpossibleg,monicadev

first test gogogogo
Merge pull request #2 from catherinev/pair-kimpossibleg,monicadev

making a capitalization change
added pizza class with attributes initialized
fixed test item
Merge pull request #4 from catherinev/pair-kimpossibleg,monicadev

commiting ours to pull theirs
Merge branch 'pair-rickytux,catherinev'
Accepting merge from rick and catherine
fixing merge error
updated spec for proper instance variable