changes
set player to playlist, removed player controls
Merge pull request #1 from lisaj0323/master

keyboard press
Merge pull request #2 from s1anden/master

Slight changes to player object
works
Merge https://github.com/475Team/hackathon
added ad counter
keyboard press works
Disabled keyboard controls
Merge pull request #4 from duanw/master

keyboard press during time interval works
works
keyboard press works
Changed from stopVideo to seekTo
lost in merge
Fixed timekeeper method
doesn't really work atm
fixed merge conflicts
Merge branch 's1anden-master'
Merge branch 'master' of https://github.com/475Team/hackathon
key press