Rubocop and happy
Add houndci file
Edit hound file
Fixed merge conflict
Merge pull request #2 from duboff/development

Rubocop and happy