this is first git project.
At 20131121
version0.2 author:zyf
that's OK
version 0.0.2
this is branch test

that's OK
this is merge test

that's OK
Merge branch 'tmx'

Conflicts:
	Test01.java
uppower version1.0

author zyf
this is first version
Merge branch 'master' of https://github.com/UpPower/myTemplate