Update hello.txt
Create pullTest
Update pullTest
Merge branch 'f2'

Conflicts:
	hello.txt