Merge remote-tracking branch 'origin/master'

Conflicts:
	Paper/grass.tex
grass.tex Caption for figure 2 had some spelling errors I had corrected, and Ravi also modified the same caption to replace the XX's. Simple conflict to resolve.
Merge remote-tracking branch 'origin/master'