I don't really want to push this...

but here it goes
Merge branch 'development' of https://github.com/ASCTech/mooculus into development

Conflicts:
	public/textbook/textbook.tex