git ignore
Merge branch 'master' of https://github.com/johnrich85/wp-related-posts

Conflicts:
	.gitignore