delete .setting folder
Merge branch 'master' of https://github.com/michaelfeng/android-joketoy
update readme.md