Nav bar on left
Merge branch 'master' of https://github.com/nickclaw/WikiProjects-Prototype

Conflicts:
	index.html