txt file generated by gui
Merge branch 'master' of https://github.com/liddictm/cs355team14

Conflicts:
	project3/Test.txt