added text
Merge branch 'master' of https://github.com/yukiy/sfpcgitworkshop

Conflicts:
	textfile.txt