Redialing done
Merge branch 'final-merge' of https://github.com/s37syed/cps613-prototype.git