change anotherFeature.txt
Merge branch 'master' of github.com:pvkhoi/intern3

Conflicts:
	anotherFeature.txt