Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml

	Chapter 4: Variables and Objects (with Time)