fluid video link
Merge branch 'master' of github.com:buznardo/artist

Conflicts:
	index.html