For the greater good.
Added previously/coming up/after that columns
Merge branch 'gh-pages' of https://github.com/jeremybmerrill/mozfestnow into gh-pages

Conflicts:
	index.html
adds media query