Merge pull request #4 from Gargadon/master

Navbar updated
Merge pull request #5 from Gargadon/trunk

Merge pull request #4 from Gargadon/master