here's a message
Merge pull request #1 from jtinfant/master

Team 1 Content
merge
added a link to Google's cached jquery
added popcorn
Added the base interactivity
Merge pull request #2 from SyracuseNewhouse/team1-video_interactivity

Team1 video interactivity
Time for keyframe appearances changed