Update paper directory
Merge branch 'master' of https://github.com/wjkoh/cs262a

Conflicts:
	paper/paper.tex