Animaciones Pulpos
Animación Hackers + Cables
Separadores Agenda
Animacion de Luces
Merge remote-tracking branch 'origin/gh-pages' into game

Conflicts:
	index.html
	static/js/scripts.js
	static/styles/styles.css