Merge pull request #134 from DBrodsky90/lauren

fixed merge errors
fixed board show merge error