a
b
Merge commit '01b1177cd257a9cd82432b868be81bd2d81c9290' into b
d
Merge branch 'b'

* b:
  b
  prueba commit

Conflicts:
	js/main.js
primer commit mío
fusion con pedro