reverted
reverted
Merge branch 'master' of https://github.com/jdmendiola/canadaglass

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