server merge

Merge branch 'dev' into marissa
merge own commit Merge branch 'dev' into marissa
color change
merge conflicts fix
color changes and search box
inbox page edits
server mergeMerge branch 'dev' into marissa
inbox page
fix merge conflicts
inbox styling
Merge pull request #44 from Swap-Meet/marissa

color and inbox styles