Paper edits
More edits
Merge branch 'master' of github.com:amyxzhang/lucy.js

Conflicts:
	paper/paper.pdf
Merge branch 'master' of github.com:amyxzhang/lucy.js

Conflicts:
	paper/paper.pdf
	paper/paper.tex