cats2
Merge branch 'master' of https://github.com/printscape/northfranklin

Conflicts:
	wp-content/themes/northfranklin/index.php