column headers
Merge branch 'intro' of https://github.com/nickclaw/WikiProjects-Prototype into columns
JUMBOTRON
more stuff
Merge branch 'master' into title

Conflicts:
	index.html