after merge then edit
add in test2
Merge branch 'master' into iss53

Conflicts:
	test1
afsaf
q
fasfasfsaf
sfasfasfa
Msfsafasferge branch 'iss53'

Conflicts:
	test1
Merge branch 'master' of github.com:iszh/iszh.github.com