Merge origin/master

Conflicts:
	src/relearning/LessonB.java
Merge origin/master

Conflicts:
	src/relearning/LessonB.java
Merge origin/master

Conflicts:
	src/relearning/LessonB.java