InitCommit should currently be usable, software assumes that the file
name in the archive is currently the same as the root.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore