first commit
1st change
2nd change
Merge branch 'master' of https://github.com/jose-soler/gitworkshop

Conflicts:
	README.md