preparing for a code merge
fix board.jade merge conflict after taking sidebar into a separate file