Create README.md
Initial commit
Primer commit

empezando con github
Merge branch 'master' of https://github.com/OsoRodrigo/CRM

Conflicts:
	README.md
probando

probando1
fadf

afsd