Q12
Merge branch 'master' of github.com:WilliamAufort/heat-equation

Conflicts:
	docs/dm.tex