Finished messaging component
Merge branch 'master' of github.com:lewisbarber1/secure-proxy-server