Fixed settings error
Merge branch 'master' of github.com:RickCooke/BigBrother