re-add
Merge branch 'master' of https://github.com/charlestw/myrepo

Conflicts:
	setup.git