commit 1

commit 2

commit 3

commit 5
Merge branch 'master' of https://github.com/1cris/gitRepoTest

Conflicts:
	WebApp1/upstream_textFile1.txt