Rubocop Fixes
Edit GitIgnore
Merge branch 'feature/clean_up' into develop