Merge remote-tracking branch 'Dorkette/master' into gh-pages
Initial file set up ASD
Merge remote-tracking branch 'Dorkette/gh-pages'