add merge script
Merge branch 'master' of https://github.com/e36freak/tools