added basic structure for navbar, as well as logo. -dh
Merge remote-tracking branch 'origin/master' into dhchanges
fixing merge issues -dh