saturday morning
Merge branch 'master' of https://github.com/gbrodman/finalProject
added info to quiz page, implemented results