syncing
Merge branch 'master' of https://github.com/ryanmp/cs325

Conflicts:
	hw1/writeup.tex