Signed-off-by: David Mendiola <jdmmendiola@gmail.com>
Merge branch 'master' of github.com:jdmendiola/canadaglass

Conflicts:
	wp-content/themes/blankslate/single.php

Signed-off-by: David Mendiola <jdmmendiola@gmail.com>