Started particle system. Redefined particle as a stand alone class (no inheritence)
Merge Conflicts.