Implemented messages
Fixed merge conflicts
Merge pull request #43 from johnttan/makemessaging

Implemented messages