some edits to the paper
push draft paper
Merge branch 'paper'

Conflicts:
	paper/biPartiteWikipedia.tex