dos lines
Thierry's changes
Thierry's change in the intro
removed set braces
forgotten degeneracies
A rather messy merge :-(
Merge branch 'master' of github.com:simhu/cubic into test

Conflicts:
	model1.tex