Updated design Nav bar
Added DS_Store to gitignore
Updated styles and fixed a merge conflict