Update testfile.txt
Update testfile.txt
Merge branch 'eric' of https://github.com/sogajeffrey/SJSU-CS160-TheDreamTeam

Conflicts:
	testfile.txt