finished all styling
ignore these
fixed merge error
Merge pull request #139 from DBrodsky90/lauren

Styling complete.