energy bar
Merge branch 'master' of https://github.com/Trayus/csc509

Conflicts:
	main.js