Thierry's changes
Merge branch 'master' of github.com:simhu/cubic

Conflicts:
	model1.tex