lab1_git: 1.3 committing the first changes (Jack and Jill to Jane and
Joe)
again
again
playing
Merge branch 'merge_exercise'
reverted changes (took a step too early in the lab)
Revert "reverted changes (took a step too early in the lab) "

This reverts commit 66c9e469a942d6c2f72b793c7f942ba03c7acff7.
lab1_git: 1.3 starting again
 branch: changed last line of the file
starting again with Jane and Joe and Red and Gree
Jack and Jill, Red and Green- original file
Jack-Jill, Red-Green
Jack Jill, Blue Purple
Jane and Joe, Red Green
Jack-Jill, Red-Green
Jack-Jill, Red-Green
Jane-Joe, Red-Green
Jane-Joe, B-P after merge