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

Conflicts:
CWcgahi14.log
CWcgahi14.pdf
CWcgahi14.synctex.gz
CWcgahi14.tex
merge