build should never be in repo
Merge branch 'master' of https://github.com/xsf/xmpp.org

Conflicts:
	.gitignore