commit for testing
Merge branch 'master' into message_board

Conflicts:
	capms/app/views/layouts/application.html.erb
Changes to home and message board
Changes to the home and message board
Merge pull request #41 from capms/message_board

Message board