style
Merge branch 'master' of https://github.com/dopeboy/Scripted-Curriculum

Conflicts:
	units/2-HTML/lessons/2-ImageStyles/README.md