css merge conflicts resolve
Merge branch 'master' of github.com:Rebecca50/Hider
Merge branch 'master' of github.com:Rebecca50/Hider
merged backgrounds etc.