context
Merge branch 'master' of http://git2.niven.cn/ccplus

Conflicts:
	include/composition.hpp