Add Testing file link
Resolve conflict, bring local branch up to date

Conflicts:
	README.md
Merge branch 'student-text-doc-links' of https://github.com/githubschool/githubschool.github.io into student-text-doc-links