Changed the Message types to work with the marshaller.
Merge branch 'master' of https://github.com/dWarf-In-thE-FlaSk/CSC411.git