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

Conflicts:
	units/1-introduction/lessons/2-Algorithms