Conflicto
Merge branch 'master' of https://github.com/diegosanchez/test_conflict

Conflicts:
	readme.txt