Should all be a subset of dnd unless I'm cray
Merge remote-tracking branch 'origin/master'

Conflicts:
	bootstrapTemplate.html