Merge branch 'master' into dragon
Delete dragon
Redesign homepage
Merge Susie's homepage changes