Merge Branch

Conflicts:
	src/gitlocal/GitLocal.java