Merge
Merge branch 'master' of https://github.com/dkong1796/ay190-final

Conflicts:
	writeup.pdf
Made some revisions to writeup
Merge branch 'master' of https://github.com/dkong1796/ay190-final

Conflicts:
	writeup.pdf
Touched up report