edited 2 files
Merge branch 'master' of ssh://git@github.com/LDreptate/EGit.git

Conflicts:
	README.md
	egitClone/src/test/stories/test/test/LookupADefinition.story