added redis to .gitignore
Merge branch 'master' into likev1
added .idea folder to .gitignore
Merge branch 'master' into likev1