message functionality should be complete
Merge branch 'merge-shah-chris-andrew' of https://github.com/s37syed/cps613-prototype.git