* hello git
Merge branch 'master' of github.com:dinge/dinghub

Conflicts:
	.gitignore