Big matrix of clips!
Don't replay the last video over and over.
Merge branch 'master' of https://github.com/smelendez/axion

Conflicts:
	js/player.js
Make click-to-play-or-pause work