HW7&8  final committed
Merge branch 'master' of https://github.com/dohie11/csf