add dev2
modify
Merge remote-tracking branch 'origin/dev'

Conflicts:
	HelloGit.txt
modify master
modify in dev