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

Sunny