Energy Added, Overheat WIP

Merge branch 'weaponsbranch'
Overheat added to beam, no visual change
Merge branch 'master' into weaponsbranch

Conflicts:
	entities/enemies2.js
	entities/weapons.js