Testing some highlight code
Merge branch 'master' of https://github.com/chuej/namesake

Conflicts:
	Resources/book/Styles/umphLandscape.css
Tests