Fix rubocop errors
Merge pull request #16 from sunny-mittal/gabe

Gabe
Fix merge conflicts
Merge pull request #17 from sunny-mittal/sunny

Sunny