second half of quiz
Merge branch 'master' of https://github.com/cliburn/bios-703-2014
Branch merge