more work on faq
more work on faq
Merge branch 'master' of github.com:victly/COGS187AFINAL