Merge branch 'master' of https://github.com/staylor/test-repo

Conflicts:
	php/src/WordPress/wp-content/mu-plugins/nyt-categorization/ajax.php

php/src/WordPress/wp-content/mu-plugins/nyt-media/nyt-media-api/class.sc
oop-image-upload.php
	php/src/WordPress/wp-content/mu-plugins/nyt-media/nyt-media.php