Second commit

Added Cup page and links to nav
Merge branch 'master' into gh-pages