fix nav 2
test
Merge branch 'master' of github.com:cwmb/clanwars