cmmiittting because i have to
fixed merge conflicts
can now watch videos at the click of a button
Merge pull request #19 from johnshaughnessy/watch_on_click

Watch on click