Added rating system
fixed merge error