Change some verbiage on some templates (mostly)
Merge branch 'master' of https://github.com/JpakMedia/the-college-dump

Conflicts:
	the-college-dump/template-add-post.php