Added bullets feature (no collision detection yet), fixed for merge