Merge pull request #1 from rvilat/SS-1

added text file 2
master changes
Merge remote-tracking branch 'origin/master' into SS-1

Conflicts:
	Here is text file 2