update rubocop.yml
Merge branch 'master' of github.com:cs198/codepuppy
Merge branch 'master' of github.com:cs198/codepuppy