Merge branch 'master' of https://github.com/valfer/SwiftIntroPlayground

Conflicts:
	3. Classes.playground/timeline.xctimeline
Merge branch 'master' of https://github.com/valfer/SwiftIntroPlayground

Conflicts:
	3. Classes.playground/timeline.xctimeline