Working on background problem
Fixed merge conflicts
moved the css from the manifest file
Updated Styles
Updated Gems
Merge branch 'master' of github.com:jlieb10/abodely