Moved navbar to separate template
Merge branch 'master' of https://github.com/eugenebut/hack2013