Fiksa opp i alt det gale Jarle gjorde
Merge branch 'master' of https://github.com/gohovd/Energy

Conflicts:
	index.html