updated in master again
Merge branch 'master' into B01

Conflicts:
	sample.txt
Added sample2 file
Merge branch 'master' into B01
Update to sample2