Latest
Merge branch 'master' of https://github.com/robertriordan/Textbook

Conflicts:
	Guardfile