q1 and q2 pretty much done, just need to format marginals correctly
model files
Merge branch 'master' of github.com:strubell/cs688-hw02