merge audio and video when uploaded
Merge branch 'master' of https://github.com/guillaume-gouchon/html5-jam