change README.md, se agrego how to start
conflictos resueltos