Add nav
Fix merge errors
Push
Merge pull request #58 from Ajhandler/config

Nav bar