added gitignore ds
added gitignore
merged new nav