text added
Merge branch 'master' of https://github.com/FelixCat/testRepository

Conflicts:
	test-project/index.jsp