at the wingit setup time update.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
mk

mk
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore