Subi readme con mi rama
Merge branch 'alejandro' of github.com:mxaxio/pruebaAxio into mark
Ya les borre todo
Merge branch 'master' of github.com:mxaxio/pruebaAxio into mark

Conflicts:
	READMEmark
Merge branch 'master' of github.com:mxaxio/pruebaAxio

Conflicts:
	READMEmark
Merge branch 'mark'

Conflicts:
	READMEmark