modified test2
victor commited
commit by victor
commit3
kkkkkkkkkkkkkkkkkkkk
aaaaaaaaaaaa
lolol
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	test2.txt
have a push.
Merge pull request #1 from hanhuan/develop

Develop