Foo added
Remove the index.html file
Revert "Remove the index.html file"

This reverts commit 9178de8d0f103db4987fc77a821b0356d5ec8175.
foo and bar added
baz added
qux added
Merge branch 'master' into development
dev header added to index
Dev added to header for index
Quux and Waldo added
Thud added
Merge branch 'master' into development

Conflicts:
	index.html