Zooi
Merge branch 'master' of https://github.com/henrilouis/energy

Conflicts:
	js/barClock.js