first commit
Merge https://github.com/marushu/launch_filemerge