up to date all
Merge https://github.com/davieghost/NewSite