Added Player.html and css
Merge branch 'master' of https://github.com/pixelpusher/mozfest2013
Fixing conflicts