navbar with links
Merge branch 'master' of https://github.com/ivanthecrazy/hackaton
cleanup