particles[i].timeLived = 0;
				particles[i].timeToLive = (float)Math.random() * 1.5f + 0.1f;
                particles[i].speed = new Vector3D((float)Math.random() - 0.5f, (float)Math.random(), (float)Math.random() - 0.5f);
				particles[i].position = new Point3D(0.0f, 0.0f, 0.0f);
				particles[i].orientationX = (float)Math.random() * 180.0f;
				particles[i].orientationY = (float)Math.random() * 180.0f;
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Ass/ParticleEffect.java
	src/Ass/Spaceship.java