Just a git use test
Hi!
A "git commit amend" test, You know~
make a change
Also a change
Merge branch 'test'

Conflicts:
	.gitignore
Also a change,too: )
Merge remote-tracking branch 'bitbucket/master'
I think there is something strange happen to the tree...

Conflicts:
	.gitignore
It's my last commit in my 2013 summer holiday... OMG...
On the Win32 Platform
Signed-off-by: FX-Ti <zjxiang1998@gmail.com>