h1 status
Merge branch 'master' of github.com:SlexAxton/txjs2013

* 'master' of github.com:SlexAxton/txjs2013:
  Adding the streaming player