change3
change4
Merge branch 'feature/test2' into develop
Merge branch 'master' of https://github.com/mafernando/Git-Example

Conflicts:
	README.md