now back to working, hopefully
Merge branch 'gh-pages' of https://github.com/jhmatthews/aida into gh-pages