Fighting with dumb media player.
Merge branch 'new-media-player' into episode-2

Conflicts:
	index.html
Merge branch 'new-media-player' into episode-2

Conflicts:
	index.html