docs
Merge branch 'master' of https://github.com/wookoouk/GeeFuTu

Conflicts:
	LICENCE