Merge branch 'master' of https://github.com/WING-NUS/scisumm-corpus

Conflicts:
	workshop_paper/tac2014.bib
	workshop_paper/tac2014.bst
	workshop_paper/tac2014.sty
	workshop_paper/tac2014.tex