Master has some update

Master updated tow read me files
Master resolved conflicts

Master awnser!