minor change
merge with devMerge branch 'dev' into marissa
back end changes Merge branch 'dev' into marissa
merged changes
font change
fix conflicts
back end mergeMerge branch 'dev' into marissa
style to details
pulled downMerge branch 'dev' into marissa
style templates done
back-end changes and login-template
Merge pull request #31 from Swap-Meet/search

Search
add drop down
fix merge conflicts
Merge pull request #32 from Swap-Meet/marissa

styling done to details pages, add page, and login
initial auth changes
auth fixed
Merge pull request #33 from Swap-Meet/auth

Auth Fixed
merge
mergeMerge branch 'dev' into search