finished catalog
Merge branch 'master' of https://github.com/heeh/CS143-lab1