editing text
Merge branch 'master' of github.com:ZulfikarSandi/Java

Conflicts:
	text.txt