links are bold
Merge branch 'master' of github.com:/christianp/deckjs-maths-template

Conflicts:
	deck/themes/style/cp.css