Merge pull request #2 from vphant/task2

task2 commit
task3 ruins common file
Merge pull request #3 from vphant/task3

task3 ruins common file
task2 add self text
Merge branch 'master' of github.com:vphant/TestRep into task2

Conflicts:
	common.txt