fixed bounding boxes and added standard enemy
Merge branch 'master' of https://github.com/leaflet757/cs20
small change to weapons

added boundless field to weapons so that they will pass screen test
fixed animation bug
added health pickup and pickups file

also changed acceleration to automatically be set to 0 after movement
improved health pickups
fixed sound
Merge branch 'weaponsbranch'
yes
fixed sound
Sound Working for Weapons
Added entity heiararchy and resource xml
Merge branch 'master' into weaponsbranch

Conflicts:
	entities/weapons.js