Merge branch 'jeff-know326302'
Merge branch 'master' of https://github.com/BrightcoveLearning/VideoCloudMediaAPI

Conflicts:
	MediaAPIExercises/MediaAPI_Ex4.html
	MediaAPIExercises/MediaAPI_Ex5.html
	MediaAPIExercises/MediaAPI_Ex6.html
	MediaAPIExercises/MediaAPI_Ex7.html
	MediaAPIExercises/MediaAPI_Ex8.html
	MediaAPIExercises/MediaAPI_ExA.html
	MediaAPIExercises/MediaAPI_ExB.html