added conditional background
Merge branch 'master' into condtionalBackground

updating with master branch
Merge pull request #71 from jsmit032/condtionalBackground

Condtional background