增加了CHOOSE_GOAL_C& CHOOSE_GOAL_I
Merge branch 'master' of https://github.com/ZoeQIAN/Fluxx

Conflicts:
	doc/MAILBOX_MSGTYPE3.0.xlsx
增加了CHOOSE_GOAL_C和CHOOSE_GOAL_I