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