changes
Merge https://github.com/mauriceAlthoff/ADM1

Conflicts:
	Serie 4/Serie4.pdf