Avance
Merge branch 'github/desarrollo'

Conflicts:
	public/js/p1-2.js