_site pages not ignored add ignore and update spanishempire
Merge branch 'master' into edit-static-pages

Conflicts:
	casestudies/index.md
update
slideshow1 in yaml
Create slides2.html

sets style and structure for all slideshows on page
Create slides1.html
Rename slides2.html to slideshow style block
Update index.md
Update index.md
Update slideshow style block
Update index.md
Create slides2.html
Create slides3.html
Create slides4.html
Update index.md
Update index.md
Update index.md
Update index.md
Rename slides1.html to voltaireslides1.html
Rename slides2.html to voltaireslides2.html