Modificacion de conflicto
Merge branch 't1'

Conflicts:
	I_S_Laravel.md