Merging the new website into my fork