This is my first using of git
hello world

he
GOD
xiugai  2
Merge branch 'exp'

Conflicts:
	file
wxpfiel
fadkfjskdfkk
Merge branch 'exp'

Conflicts:
	expfile
Merge https://github.com/viciousstar/FoOTOo_Newbies_Trainning
Delete Vbird.pdf

搞错了 搞错了
Delete expfile
Delete file
任务一
这是我
Merge pull request #3 from viciousstar/ViciOs

ViciOs