mein präseteil
Merge branch 'master' of https://github.com/s-lau/final-payment

Conflicts:
	presentations/pres_2013-02-13.html