.
Merge branch 'master' of https://github.com/gotoshake/quick-cc

Conflicts:
	gd/char.lua
	gd/main.lua