add tests
template changes
login changes Merge branch 'dev' into marissa
merge
Merge pull request #35 from Swap-Meet/offer

Offer
filter template styling
formatting changes
fix conflicts
reformat schema
remove extra logs
Add in front end stuff. Merge branch 'dev' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into addTrade
add fonts
Merge pull request #36 from Swap-Meet/addTrade

Modify DB to use Trade schema
Merge pull request #37 from Swap-Meet/marissa

added fonts and template to choose games
merge
merge
did some stuff
updated search & simple caching
fixed merge conflicts
search functionality when logged in