Merge branch 'master' of https://github.com/abduld/CS598

Conflicts:
	final/paper.tex