HW6 Step1
Merge pull request #1 from BrunoWinck/develop

HW6 Step1