foo and bar added
baz added
qux added
Merge branch 'master' into development
dev header added to index
Quux and Waldo added
Thud added
Merge branch 'master' into development

Conflicts:
	index.html