Merge branch 'master' into gh-pages
add web.config
remove thi
clean out Bw from gh-pages post merge
update for win and mac
merge upstream
scapes >> stories
scapes >> stories
make ancient-egypt branch the new github page
remove dead ref