The sixth homework done + Friday classwork
Merge remote-tracking branch 'origin/master'