didn’t need the brackets for the apostrophe
Merge branch 'master' of github.com:specialorange/IDC2014

Conflicts:
	sigproc-sp.fdb_latexmk
	sigproc-sp.log
	sigproc-sp.pdf
	sigproc-sp.tex