Merge remote-tracking branch 'tpdextras/master' into videoClient2
Prefer Jules White's README.md to ours.

Conflicts:
	README.md
Move README.md and image for VideoClient to assignments/Asgn1-VideoUp/static, as README.md conflicts with the course repo README.md.