testing pull requests
Merge branch 'master' of https://github.com/n2diving/fistfive into frontendbranch
conditional links in the nav bar