changes to style.css, faq.haml, fixed merge conflicts in board.html