Merge branch 'master' of https://github.com/Zugbug/Lessons

Conflicts:
	src/lessonsthing2/Lesson.java

Attempt at merging