Updated parlors page with content and images
Merge branch 'master' of https://github.com/victly/COGS187AFINAL