Use new includsions
Merge branch 'master' of github.com:stoey/bdaidotorg

Conflicts:
	data/index.html.json