q2 finished, minus the pause part of course
Merge branch 'master' of github.com:mwzzhang/engr1200-assn1

Upstream has a pointless README file which was not pulled before