commiting ours to pull theirs
Merge pull request #4 from catherinev/pair-kimpossibleg,monicadev

commiting ours to pull theirs