player camera class added, player class added
merge coflicts fixed