added gitmerge files to new folder
Merge branch 'restructure'
fixed print statement
Merge branch 'master' into git-series

Conflicts:
	pyrecon/tools/mergeTool/git/gitmerge.py