Canvas para animación
Merge branch 'animation-testing'

Conflicts:
	index.html
	js/handlers.js