Finished week 2, exc. bonus ass.
Merge branch 'master' of https://github.com/condda/SoftwareTestingFT_G