Changed particle sysystem to include colors
Fixed merge conflicts