added nav to create trip
Merge branch 'master' of github.com:mitraraman/socialtraveler into nav
fixed merge error in nav bar
Merge branch 'master' of github.com:mitraraman/socialtraveler into nav
removed fading nav