Adding custom setting
Merge branch 'master' of https://github.com/benedwards44/tquilateamtalk