So I was getting all these emails since I am watching this repo... :)
Merge branch 'reviewQuestion' of git://github.com/matth-vertigo/class-website-template into matth-vertigo-reviewQuestion

Conflicts:
	content/review.md
Merge branch 'matth-vertigo-reviewQuestion'

Conflicts:
	content/review.md