all changes changes minus the custom player, chrome xtension, and flyup bubble
Merge branch 'master' of https://github.com/EmilioTelevision/emilio-television