Finished Person 2 (Tested)
Changed Person 2 name to Ambrose
Changed Person 2 name to Ambrose
Edited Person 1
Merge branch 'sarah'
Update and rename README.md to README.p4.md
Delete useless.p4.txt

sarah williford deleted this
Completed Person 1 and tested with Ant
removal of useless txt, added readme
Merge branch 'raoul'

Conflicts:
	.gitignore
merging from master
Create readme.p4.md

the readme file for sarah (p4)
Rename readme.p4.md to readme.p4.txt
Rename README.p4.md to README.p4.txt
Merge pull request #1 from Rrego6/sarah

Delete useless.p4.txt
committing my swilliford6.gradle file for the first time. hope it works...