Fixing bug coming from setting screen not displaying new default
Merge branch 'master' of github.com:jasonmit/ios-hw1-tip