Tweak to class 6 exercises
Merge remote-tracking branch 'upstream/master'
Tweak to class 6 exercise 5
Improve class 1
Merge remote-tracking branch 'upstream/master'