Merge.
Merge branch 'master' of https://github.com/hanboa/aaai2014

Conflicts:
	CWcgahi14.aux
	CWcgahi14.log
	CWcgahi14.synctex.gz