master data
Merge remote-tracking branch 'origin/master'
rm settings
edit .gitignore