updated infomation
Merge branch 'master' of github.com:PalmerCurling/My-Website

updating various things