Finished results (no figures jet)
Merge remote-tracking branch 'origin/master'

Conflicts:
	paper.log
	paper.pdf
	paper.synctex.gz