add video files
Merge remote-tracking branch 'origin/master'

Conflicts:
	alpha-beta/static/js/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	alpha-beta/static/js/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	alpha-beta/static/js/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	alpha-beta/pages/song.kick.html
	alpha-beta/static/js/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	alpha-beta/pages/song.kick.html
	alpha-beta/static/js/index.js