Snapshot for the sake of a merge.
Merge branch 'master' of https://github.com/bradyjgarvin/csce990

Conflicts:
	report/report.tex