Merging site

Merging my changes with the new repo.