Catalog
Fixed everything
Merge branch 'fay' of github.com:glentakahashi/cs143-project1 into fay