Added intro
Merge branch 'master' of https://github.com/smelendez/axion

Conflicts:
	js/clips.js