Rubocop finished.
Merge branch 'mavis2_dev'

Rubocop finished and can start HW6