Added Redis Module
Added Redis
Modified conflict
Resolved redis submodule conflict