added two way merge function to git_tools
Merge pull request #9 from evansde77/merge_util

merged #9