Small typo's fixed in the readme, and added some lines in the cores.json file.
Fixed merge conflict.