Merge branch 'gh-pages'
infects infected rooms
Merge branch 'master' of https://github.com/AstroTeam/Astro
Merge branch 'master' into gh-pages