changed constructor for Message class and added public static enum
Continuing work on master's test 3
Fixed merge conflicts from travis2
vic's changes - added launcher
vic merge
fixed andrew merge conflicts