Godzil/Crunchy

changed the merge from using mkvmerge to using ffmpeg

#118

elisha464 wants to merge elisha464:fix-merge into Godzil:master