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

Conflicts:
	CWcgahi14.log