doing stuff to pull
fixing merge conflics

weapons now use energy when firing

Merge branch 'master' of https://github.com/encephalopathy/wepwep

Conflicts:
	branches/pewpew_corona_port/com/game/weapons/primary/BackshotWeapon.lua
	branches/pewpew_corona_port/com/game/weapons/primary/DoubleshotWeapon.lua
	branches/pewpew_corona_port/com/game/weapons/primary/SingleshotWeapon.lua
	branches/pewpew_corona_port/com/game/weapons/primary/SpreadshotWeapon.lua
added energy mechanics to the game

-weapons now use energy when firing
-some bugs may be present; please report