Update discussion.latex
Update discussion.latex
Update discussion.latex
Update discussion.latex
Merge branch 'justin'

Conflicts:
	discussion.latex
fix a few refs in intro