added f1.txt and removed t1.txt on the master branch
added W1.txt file on the master branch
changed W1.txt file on the master branch
added W1.txt on the develop branch
changed W1.txt on the develop branch
Merge branch 'master' into develop

Conflicts:
	W1.txt