working base
Merge branch 'master' of https://github.com/darknesswind/gn_enbu_chs

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'