student accept implemented
messages almost working.
Merge branch 'sam-dev' into cam-dev