redis db update
Merge branch 'master' of github.com:mpvazquez/scattergories
merged new code
merge conflicts fixed