push new feature3
Merge branch 'master' of github.com:roongr2k7/git_training_with_conflicts

Conflicts:
	feature3.txt