added ad counter
Disabled keyboard controls
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