starting to integrate player
Merge branch 'master' into Dan
switching to require.js
stopping for a bit