settings file changes before merge
after pull to update the colors and picture on index page
Merge branch 'master' of github.com:mccall114/SusanDahlinArt