Updated the paper
Merge remote-tracking branch 'origin/master' into hj

Conflicts:
	exps.tex