changed 1st line to jane and joe
changed last line of merge conflicts
merged with sandbox