travis
bla
Merge branch 'master' of github.com:theonion/videojs-vast-plugin into new-vast

Conflicts:
	.travis.yml