Commit Graph

1 Commits

Author SHA1 Message Date
Woody Folsom
035fb5039a Merge branch 'master' of woodyfolsom.net:/opt/git/cs6601p2
Conflicts:
	writeup/P2 Proposal.aux
	writeup/P2 Proposal.log
	writeup/P2 Proposal.pdf
	writeup/P2 Proposal.tex

Also added final, turned-in writeup 'Project 2 BayesChef.pdf'.
2012-03-13 14:17:14 -04:00