Update upstream_textFile1.txt
Merge branch 'upstreamMastercopy' of https://github.com/1cris/gitRepoTest into upstreamMastercopy

Conflicts:
	WebApp1/upstream_textFile1.txt