ii
Merge remote-tracking branch 'origin/master'
jenny- program settings changed
first commit from Jenny's