adding my stuff
pushing my stuff
mistake
starting to integrate player
Merge branch 'master' into Dan
Cleaned up html and added triggers
switching to require.js
stopping for a bit