adding to favs from search works and moved signout to footer
fixed conflicts from latest dev pull
Merge branch 'dev' into karldev
fixed dependency error in nav ctrl
trying to put a sign out in the footer
initial toggles for favs and offers
Merge branch 'dev' into karldev
still working on toggles
fix merge conflicts
working on toggles
removed build
:wq
Merge branch 'dev' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into dev
fixed merge conflicts
still working on favorites again still
Merge branch 'dev' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into dev
g
Merge branch 'dev' into karldev
fixed merge conflicts
Merge branch 'dev' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into dev
fixed merge conflicts