Saving my changes
Merge branch 'master' of https://github.com/dibieo/jcdl_2014

Conflicts:
	sigproc-sp.log
	sigproc-sp.pdf
	sigproc-sp.synctex.gz
Merge branch 'master' of https://github.com/dibieo/jcdl_2014
Saving document changes