videojs added
Merge branch 'master' of https://github.com/wafflestudio/cumulus

Conflicts:
	rails_app/app/assets/javascripts/application.js
	rails_app/app/assets/javascripts/explorer.js.coffee
Merge branch 'master' of https://github.com/wafflestudio/cumulus

Conflicts:
	.gitignore