J.W. added a2 q7
Merge branch 'master' of https://github.com/wongwingho/csc324