commit para master antes de merge
Merge branch 'bugFix'

Conflicts:
	for-tests
ejemplo
Added the file for master
add folder master
merge en master
rebase commit master
rebase commit bugfix