Initial commit
Merge https://github.com/gbili/gfw

Conflicts:
	.gitignore