Now able to specify the 2 files to be merged as commandline arguments
Merge remote-tracking branch 'upstream/merging' into merging