Merge branch 'master' of https://github.com/sabregoldman/study-skills-curriculum
Merge branch 'master' of https://github.com/sabregoldman/study-skills-curriculum
Update preface.rst
Merge branch 'master' of https://github.com/sabregoldman/study-skills-curriculum
Merge branch 'master' of https://github.com/ghoulmann/study-skills-curriculum

Conflicts:
	preface.rst