init
Merge branch 'master' of https://github.com/kjetilge/meteor-flowplayer