Merge branch 'master' into admin
Merge branch 'master' into admin
rubocop changes
idk
styling
merge conflicts
Merge pull request #16 from xtina-starr/style

Style