Merge remote-tracking branch 'origin/master'

Conflicts:
	paper.tex
what is going on