marleau/cs122b_moviequiz — comment on commit a32a869c9c77ae045c0d8a5326bb6194a719673c
File:  line 0
By marleau:

I merged everything with our project 3 site, so I'm not sure why there's 2.