This is a test of the line 28
This is a test of the line 28

Line 28 was line that was edited in two different commits one by adam and one by jose
this test is to learn about editing the same file at the same time.

abrenner/cs122c-project2,abrenner/cs122c-project2,abrenner/cs122c-project2