comen
Merge branch 'master' of https://github.com/marhg/TallerJS01

Conflicts:
	build/taller1.min.js

Signed-off-by: CynthiaBarindelli <cynthia.barindelli@outlook.com>