Outline
Merge branch 'master' of https://github.com/hoshi89/Forgotten

Conflicts:
	Forgotten/Forgotten/AnswerCls.cpp
	Forgotten/Forgotten/CardCls.cpp

	modified:   Forgotten/Forgotten/AnswerCls.cpp
	modified:   Forgotten/Forgotten/CardCls.cpp
	modified:   Forgotten/Forgotten/CardCls.h
Merge branch 'master' of https://github.com/hoshi89/Forgotten