Initial setting
Merge branch 'master' of github.com:bretep/settings