fix routing issue
Merge branch 'master' into development
Merge branch 'master' of https://github.com/Neelp22/wdi_project_3 into development
fix redis; add concurrency
fix conflicts