merging
Merge remote-tracking branch 'origin' into message_board
front end
Merge pull request #45 from capms/message_board

Front end
Fixed merge conflicts with front end stuff