updated settings
Merge branch 'master' of github.com:mccall114/SusanDahlinArt