making a capitalization change
Merge pull request #2 from catherinev/pair-kimpossibleg,monicadev

making a capitalization change
commiting ours to pull theirs
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
Merge pull request #5 from catherinev/pair-kimpossibleg,monicadev

updated spec for proper instance variable
we didn't change anything... we may have deleted a space but all test work