Merge Master and remove MATLAB files