implemented message system
tested and debugged messages
Merge remote-tracking branch 'upstream/master'