change setting
Merge branch 'master' of https://github.com/most-wanted/PopTutorial