Fixed the bug where the player wouldn't fire when the haters were firing on the same frame.
Renamed Collectable.lua to Collectible.lua.
Renamed CollectableHeap.lua to CollectibleHeap.lua.
Adding Collectibles and a Health pick up to the game.  It spawns every time a hater dies.
Adding a collision flag reference id reference for all movable objects.
Merge branch 'master' of https://github.com/encephalopathy/wepwep

Conflicts:
	branches/pewpew_corona_port/com/game/Player.lua