sdfsd
Merge remote-tracking branch 'origin/doing' into doing

Conflicts:
	model.tex