-FIXED- bullet mechanics
-MERGE- Bullet Prefab

Conflicts:
	Assets/Prefabs/BulletPlayer.prefab