saving settings
Merge branch 'master' of github.com:lingtong-sun/The-Three-Amigos
fixed bug