Ausdruck!!
Merge branch 'master' of https://github.com/gohovd/Energy

Conflicts:
	README.md