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

Conflicts:
	index.html
Merge branch 'master' into title

Conflicts:
	index.html