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
merge
working on toggles
ytfrdfgt6hgerge 'dev' into marissa
delete build
removed build
:wq
Merge branch 'dev' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into dev
fixed merge conflicts
ibox page
login fixMerge branch 'dev' into marissa
fix jshint
still working on favorites again still