template changes
login changes Merge branch 'dev' into marissa
merge
filter template styling
formatting changes
fix conflicts
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
Merge pull request #38 from Swap-Meet/karldev

search functionality when logged in - early stages of adding to favorites
Add angular Tabs for the Profile page
Update Tabs
Merge pull request #39 from Swap-Meet/addProfileTabs

Add profile tabs
merge