changed enemies
WOOOOOOOOOOOO
my version
removed print message
small change to map
started on new shooting enemy
added resources
merge attempt
Energy Bug Fix

energy would charge while paused
changed effect on pickup
Merge branch 'master' of https://github.com/LuckyMarq/collide
Merge branch 'master' into Leif

Conflicts:
	entities/enemies.js
Merge branch 'master' into Leif

Conflicts:
	entities/enemies.js