Primer Commit
Segundo commit
Jira 1 fixed agrego a pepe
Jira 2 arreglado
Jira 3 arreglado
Merge branch 'jira3'

Conflicts:
	README.txt
jira 5 arreglado
jira 4 final.
Merge branch 'master' of https://github.com/betinaperedo/gittutorial