replace playground
Merge branch 'master' into new-playground

Conflicts:
	GuidedTour.playground/contents.xcplayground
	GuidedTour.playground/section-13.swift
	GuidedTour.playground/timeline.xctimeline
Merge branch 'new-playground'