asdfasfd
Merge branch 'master' of https://github.com/broiser/green-computing

Conflicts:
	Produktlebenszeit.lyx~