Comment out broken dropdown code in navbar.js
Fix merge conflict in navbar.js
Add dropdown functionality to navbar
Merge pull request #225 from vreddy18/master

Add dropdown functionality to navbar