styling nav bar
layout
conflicts
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
Merge branch 'master' of github.com:KatherineMuedas/moar-coffee
adds search box for location and cafe name
Layouts and style changes and some bugs fixes
fixing conflicts