Added text as well.
Merge branch 'master' of https://github.com/SilviaSlavcheva/Java

Conflicts:
	JavaGit.txt