bug fixed 2
resolve conflict with fb img & email pic
resolve conflict with fb img & email pic
Merge pull request #26 from deuxio/navbar

Navbar ok