Revert "complete task 2.2"

This reverts commit 376ad621e0f277a5cec688b3743ff63b3681bf58.
Merge branch 'master' of github.com:paopeed/git-_training
Merge branch 'master' of github.com:paopeed/git-_training

Conflicts:
	feature2.txt