Home Page try 3
fix conflict
Merge branch 'master' into home_page
Message Board
merging with master
message board
Merge pull request #30 from capms/message_board

Message board