Initial commit
Merge branch 'master' of github.com:zfbp/god

Conflicts:
	.gitignore