resolve conflicts
Merge branch 'master' of github.com:deuxio/airbnc into navbar
merge conflicts
Merge pull request #27 from deuxio/navbar

Navbar