master comment
test branch
Merge branch 'fromTest' of https://github.com/1cris/gitRepoTest into fromTest

Conflicts:
	WebApp1/WebApp1.csproj