Reconnecting to remote repository
Merge branch 'master' of github.com:bmatthews68/ldapunit

Conflicts:
	.gitignore