added redis to .gitignore
Merge branch 'master' into likev2
added .idea folder to .gitignore
Merge branch 'master' into likev2
minor fix in destroy.js.erb