Remove merge conflicts from README
Remove merge conflicts from README

stoilov/Programming101,stoilov/Programming101,stoilov/Programming101,stoilov/Programming101,stoilov/Programming101,stoilov/Programming101