writeup.pdf...
Merge branch 'master' of https://github.com/damlaren/cs244b_final_project

Conflicts:
	writeup/writeup.pdf
merging