lesson encoding
Merge branch 'master' of https://github.com/Tenari/ZapClass2.0

Conflicts:
	app/helpers/lessons_helper.rb
LESSON: algebra l1 encoded