update feature 1
Merge branch 'master' of https://github.com/PCNguyen/git-demonstration

Conflicts:
	feature 1.txt