Changed media files to .ogg
Merge remote-tracking branch 'origin/master'