Merge pull request #1 from For-Tomorrow/dev

pull request others
fixed a bug miss';' and change to sh-win8
add a win8.txt
add a date in win8.txt
Just a rebase test
Just add a line in rebase_test.txt on branch1
Just add a line in rebase_test.txt on branch1

Revert HEAD and delete the line add in rebase_test.txt
add msg & delete msg combined.

This reverts commit 5d0928c274a60fe2748fd5e8f1a4a25bf710a5b7.
Merge pull request #4 from guweibing713/dev

rebase test add & fixed main.cpp bug.