helping with feature 2
Merge branch 'master' of https://github.com/PCNguyen/git-demonstration

Conflicts:
	feature 2.txt