main.tex wip2
Merge branch 'master' of https://github.com/joonwonc/mit-6858-project

Conflicts:
	docs/paper/main.tex