just test

test
Merge branch 'master' of https://github.com/lunchpy/ft into lunchpy-master

Conflicts:
	README.md
Merge pull request #1 from lunchpy/master

fetch
1
Merge pull request #2 from lunchpy/master

fetch2
Merge pull request #3 from lunchpy/master

add cn
push2
Merge pull request #2 from FishYz/master

push2