updating q2
Merge branch 'master' of github.com:mattchaney/cs595-f14