- quick fix
Merge remote-tracking branch 'origin/master'
- setting player position
- diamonds act as rocks regard falling