edit nav
Merge branch 'master' of github.com:plique/WebWebWhat

Conflicts:
	index.html
Merge branch 'master' of github.com:plique/WebWebWhat