.changed chap_future
Merge branch 'master' of https://github.com/ManicPumpkin/Seminar-MAI3
-reedit Risiken: Übertragung
Merge branch 'master' of https://github.com/ManicPumpkin/Seminar-MAI3

Conflicts:
	tex/draft/chap_energy_in_future.tex