Merge origin/master

Conflicts:
	README.md
Graded Lesson 5 with comments.