rubocop cleanup
added login prw feature
fixed merge conflict
changed background color for fun