Update README.md
Update README.md
Update new_file.txt
Update new_file.txt
Merge pull request #13 from cbuckey-uda/line-1

Line 1
long file
Add z
Merge pull request #14 from cbuckey-uda/add-z

Add z
Add long line
Break up the long line
Merge pull request #16 from cbuckey-uda/long-line

Add long line
Remove av and add aw
Put av back
Merge pull request #17 from cbuckey-uda/deletion

Remove av and add aw
Merge branch 'master' into diff-format-test

Conflicts:
	README.md
Merge pull request #12 from cbuckey-uda/diff-format-test

Update README.md
Merge branch 'master' into conflict-1

Conflicts:
	README.md