removing mp3 and webm to get download under 10mb
fixed preroll adclick
status update on pulls
fixed formatting
more pull updates
Merge remote-tracking branch 'origin/master'
change from mouse_down to click
Merge remote-tracking branch 'origin/master'
added test for local media files