update navbar with jquery script and drop down
trying to fix merge conflict
Merge pull request #21 from asoper29/merge

Merge