almost done with styling finishing up the boards show
fixed merge errors
Merge pull request #134 from DBrodsky90/lauren

fixed merge errors