one change
Merge branch 'mod' of https://github.com/bryce-anderson/githubtest

Conflicts:
	README.md -> Double edited! Was merged.