Did the view for the settings page
made changes?
style conflicts
Merge branch 'master' of github.com:mitraraman/socialtraveler
conlfict with REDME
index is fine
Added logo back to homepage the old way, added css -- Mitra you can remove (on line 108-115)
New Dash done. added jquery
had to improvise with add/decline buttons; dash done
added placeholder