Merge remote-tracking branch 'Chris/master'
Format
Added Getters and Setters to Message
Merge remote-tracking branch 'Mfioravan/master'
Added messages list to User