Recover from mangled merge

[drphilmarshall]

@XiaoleiMeng you should be good to go now. Please try making the paper PDF, it should look like Tommaso's final versions, but with a few small things fixed in the text by me. Good luck with submission!

PS. I fixed all this by first checking out Tommaso's final version in a separate branch, then comparing his latex file with mine (in master) using the git difftool. Here are the commands:

git log docs/paper/High_resolution_imaging_requirements.tex
git checkout 55e0790fb53f7f532b9a73fe32b593de894d990c
git checkout -b tommaso

git difftool tommaso master docs/paper/High_resolution_imaging_requirements.tex

I then edited the latex file in the tommaso branch with my edits, and then merged back into master. This caused a conflict, as expected - to resolve it I simply checked out the tommaso branch file to force this to be the one we keep.

git checkout master
git merge tommaso
git checkout tommaso -- docs/paper/High_resolution_imaging_requirements.tex